diff --git a/src/cli/et/make/commands/test.py b/src/cli/et/make/commands/test.py
index 6deb66fcbf..e04a63779d 100644
--- a/src/cli/et/make/commands/test.py
+++ b/src/cli/et/make/commands/test.py
@@ -95,9 +95,15 @@ def test():
 
     click.echo(
         click.style(
-            f"\n 🎉 Success! Test file created at: {file_path}"
-            f"\n 📝 Get started with tests:  {DocsConfig().DOCS_URL__WRITING_TESTS}"  # noqa 501
-            f"\n ⛽ To fill this test, run: `uv run fill {file_path} --until={fork}`",
+            f"\n 🎉 Success! Test file created at: {file_path}",
             fg="green",
         )
     )
+
+    click.echo(
+        click.style(
+            f"\n 📝 Get started with tests:  {DocsConfig().DOCS_URL__WRITING_TESTS}"
+            f"\n ⛽ To fill this test, run: `uv run fill {file_path} --until={fork}`",
+            fg="cyan",
+        )
+    )
diff --git a/src/cli/et/make/templates/blockchain_test.py.j2 b/src/cli/et/make/templates/blockchain_test.py.j2
index 29f4a7c4b3..484ace4183 100644
--- a/src/cli/et/make/templates/blockchain_test.py.j2
+++ b/src/cli/et/make/templates/blockchain_test.py.j2
@@ -16,10 +16,9 @@ def test_{{test_name}}(blockchain_test: BlockchainTestFiller, pre: Alloc):
 
     TODO: (Optional) Enter a more detailed test function description here.
     """
-    tx = Transaction(
-        sender=pre.fund_eoa(),
-        to="0x000000000000000000000000000000000001abe1",
-    )
+    sender = pre.fund_eoa()
+
+    tx = Transaction(sender=sender, to=sender)
 
     post: dict[str, dict] = {}
 
diff --git a/src/cli/et/make/templates/state_test.py.j2 b/src/cli/et/make/templates/state_test.py.j2
index 1de76fe5ef..6218abe90d 100644
--- a/src/cli/et/make/templates/state_test.py.j2
+++ b/src/cli/et/make/templates/state_test.py.j2
@@ -18,10 +18,9 @@ def test_{{test_name}}(state_test: StateTestFiller, pre: Alloc):
     """
     env = Environment()
 
-    tx = Transaction(
-        sender=pre.fund_eoa(),
-        to="0x000000000000000000000000000000000001abe1",
-    )
+    sender = pre.fund_eoa()
+
+    tx = Transaction(sender=sender, to=sender)
 
     post: dict[str, dict] = {}
 
diff --git a/src/config/docs.py b/src/config/docs.py
index 5036b517b4..6de45ae195 100644
--- a/src/config/docs.py
+++ b/src/config/docs.py
@@ -7,8 +7,6 @@
 
 from pydantic import BaseModel
 
-from .app import AppConfig
-
 
 class DocsConfig(BaseModel):
     """
@@ -21,7 +19,7 @@ class DocsConfig(BaseModel):
     GENERATE_UNTIL_FORK: str = "Osaka"
     """The fork until which documentation should be generated."""
 
-    DOCS_BASE_URL: str = f"https://ethereum.github.io/execution-spec-tests/v{AppConfig().version}"
+    DOCS_BASE_URL: str = "https://ethereum.github.io/execution-spec-tests"
 
     # Documentation URLs prefixed with `DOCS_URL__` to avoid conflicts with other URLs
     DOCS_URL__WRITING_TESTS: str = f"{DOCS_BASE_URL}/writing_tests/"