diff --git a/codex-rs/apply-patch/tests/fixtures/scenarios/019_multiple_context_lines/patch.txt b/codex-rs/apply-patch/tests/fixtures/scenarios/019_multiple_context_lines/patch.txt
deleted file mode 100644
index d057b480a0..0000000000
--- a/codex-rs/apply-patch/tests/fixtures/scenarios/019_multiple_context_lines/patch.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-*** Begin Patch
-*** Update File: example.py
-@@ class BaseClass:
-@@     def method():
--        # to_remove
-+        # to_add
-*** End Patch
diff --git a/codex-rs/apply-patch/tests/fixtures/scenarios/019_multiple_context_lines/expected/example.py b/codex-rs/apply-patch/tests/fixtures/scenarios/020_multiple_context_lines/expected/first.py
similarity index 69%
rename from codex-rs/apply-patch/tests/fixtures/scenarios/019_multiple_context_lines/expected/example.py
rename to codex-rs/apply-patch/tests/fixtures/scenarios/020_multiple_context_lines/expected/first.py
index e8c18943e3..dfe9ec73ef 100644
--- a/codex-rs/apply-patch/tests/fixtures/scenarios/019_multiple_context_lines/expected/example.py
+++ b/codex-rs/apply-patch/tests/fixtures/scenarios/020_multiple_context_lines/expected/first.py
@@ -1,10 +1,10 @@
 class BaseClass:
-    def method():
+    def method(self):
         # to_add
         pass
 
 
 class OtherClass:
-    def method():
+    def method(self):
         # untouched
         pass
diff --git a/codex-rs/apply-patch/tests/fixtures/scenarios/020_multiple_context_lines/expected/second.py b/codex-rs/apply-patch/tests/fixtures/scenarios/020_multiple_context_lines/expected/second.py
new file mode 100644
index 0000000000..d1f4523f2c
--- /dev/null
+++ b/codex-rs/apply-patch/tests/fixtures/scenarios/020_multiple_context_lines/expected/second.py
@@ -0,0 +1,10 @@
+class BaseClass:
+    def method(self):
+        # untouched
+        pass
+
+
+class OtherClass:
+    def method(self):
+        # to_add
+        pass
diff --git a/codex-rs/apply-patch/tests/fixtures/scenarios/019_multiple_context_lines/input/example.py b/codex-rs/apply-patch/tests/fixtures/scenarios/020_multiple_context_lines/input/first.py
similarity index 70%
rename from codex-rs/apply-patch/tests/fixtures/scenarios/019_multiple_context_lines/input/example.py
rename to codex-rs/apply-patch/tests/fixtures/scenarios/020_multiple_context_lines/input/first.py
index 6455a5277f..a475891ece 100644
--- a/codex-rs/apply-patch/tests/fixtures/scenarios/019_multiple_context_lines/input/example.py
+++ b/codex-rs/apply-patch/tests/fixtures/scenarios/020_multiple_context_lines/input/first.py
@@ -1,11 +1,10 @@
 class BaseClass:
-    def method():
+    def method(self):
         # to_remove
         pass
 
 
 class OtherClass:
-    def method():
+    def method(self):
         # untouched
         pass
-
diff --git a/codex-rs/apply-patch/tests/fixtures/scenarios/020_multiple_context_lines/input/second.py b/codex-rs/apply-patch/tests/fixtures/scenarios/020_multiple_context_lines/input/second.py
new file mode 100644
index 0000000000..33886ecbc8
--- /dev/null
+++ b/codex-rs/apply-patch/tests/fixtures/scenarios/020_multiple_context_lines/input/second.py
@@ -0,0 +1,10 @@
+class BaseClass:
+    def method(self):
+        # untouched
+        pass
+
+
+class OtherClass:
+    def method(self):
+        # to_remove
+        pass
diff --git a/codex-rs/apply-patch/tests/fixtures/scenarios/020_multiple_context_lines/patch.txt b/codex-rs/apply-patch/tests/fixtures/scenarios/020_multiple_context_lines/patch.txt
new file mode 100644
index 0000000000..cef95e106f
--- /dev/null
+++ b/codex-rs/apply-patch/tests/fixtures/scenarios/020_multiple_context_lines/patch.txt
@@ -0,0 +1,12 @@
+*** Begin Patch
+*** Update File: first.py
+@@ class BaseClass:
+@@     def method(self):
+-        # to_remove
++        # to_add
+*** Update File: second.py
+@@ class OtherClass:
+@@     def method(self):
+-        # to_remove
++        # to_add
+*** End Patch
diff --git a/codex-rs/apply-patch/tests/fixtures/scenarios/020_multiple_context_lines_partial_success/expected/failure.py b/codex-rs/apply-patch/tests/fixtures/scenarios/021_multiple_context_lines_partial_success/expected/failure.py
similarity index 100%
rename from codex-rs/apply-patch/tests/fixtures/scenarios/020_multiple_context_lines_partial_success/expected/failure.py
rename to codex-rs/apply-patch/tests/fixtures/scenarios/021_multiple_context_lines_partial_success/expected/failure.py
diff --git a/codex-rs/apply-patch/tests/fixtures/scenarios/020_multiple_context_lines_partial_success/expected/success.py b/codex-rs/apply-patch/tests/fixtures/scenarios/021_multiple_context_lines_partial_success/expected/success.py
similarity index 100%
rename from codex-rs/apply-patch/tests/fixtures/scenarios/020_multiple_context_lines_partial_success/expected/success.py
rename to codex-rs/apply-patch/tests/fixtures/scenarios/021_multiple_context_lines_partial_success/expected/success.py
diff --git a/codex-rs/apply-patch/tests/fixtures/scenarios/020_multiple_context_lines_partial_success/input/failure.py b/codex-rs/apply-patch/tests/fixtures/scenarios/021_multiple_context_lines_partial_success/input/failure.py
similarity index 100%
rename from codex-rs/apply-patch/tests/fixtures/scenarios/020_multiple_context_lines_partial_success/input/failure.py
rename to codex-rs/apply-patch/tests/fixtures/scenarios/021_multiple_context_lines_partial_success/input/failure.py
diff --git a/codex-rs/apply-patch/tests/fixtures/scenarios/020_multiple_context_lines_partial_success/input/success.py b/codex-rs/apply-patch/tests/fixtures/scenarios/021_multiple_context_lines_partial_success/input/success.py
similarity index 100%
rename from codex-rs/apply-patch/tests/fixtures/scenarios/020_multiple_context_lines_partial_success/input/success.py
rename to codex-rs/apply-patch/tests/fixtures/scenarios/021_multiple_context_lines_partial_success/input/success.py
diff --git a/codex-rs/apply-patch/tests/fixtures/scenarios/020_multiple_context_lines_partial_success/patch.txt b/codex-rs/apply-patch/tests/fixtures/scenarios/021_multiple_context_lines_partial_success/patch.txt
similarity index 100%
rename from codex-rs/apply-patch/tests/fixtures/scenarios/020_multiple_context_lines_partial_success/patch.txt
rename to codex-rs/apply-patch/tests/fixtures/scenarios/021_multiple_context_lines_partial_success/patch.txt
diff --git a/codex-rs/apply-patch/tests/fixtures/scenarios/022_multiple_context_lines_overlap/expected/foo.txt b/codex-rs/apply-patch/tests/fixtures/scenarios/022_multiple_context_lines_overlap/expected/foo.txt
new file mode 100644
index 0000000000..cd2029d7f8
--- /dev/null
+++ b/codex-rs/apply-patch/tests/fixtures/scenarios/022_multiple_context_lines_overlap/expected/foo.txt
@@ -0,0 +1,5 @@
+foo
+bar
+bar
+bar
+new
diff --git a/codex-rs/apply-patch/tests/fixtures/scenarios/022_multiple_context_lines_overlap/input/foo.txt b/codex-rs/apply-patch/tests/fixtures/scenarios/022_multiple_context_lines_overlap/input/foo.txt
new file mode 100644
index 0000000000..e63516ff26
--- /dev/null
+++ b/codex-rs/apply-patch/tests/fixtures/scenarios/022_multiple_context_lines_overlap/input/foo.txt
@@ -0,0 +1,5 @@
+foo
+bar
+bar
+bar
+baz
diff --git a/codex-rs/apply-patch/tests/fixtures/scenarios/022_multiple_context_lines_overlap/patch.txt b/codex-rs/apply-patch/tests/fixtures/scenarios/022_multiple_context_lines_overlap/patch.txt
new file mode 100644
index 0000000000..da9d73d39c
--- /dev/null
+++ b/codex-rs/apply-patch/tests/fixtures/scenarios/022_multiple_context_lines_overlap/patch.txt
@@ -0,0 +1,7 @@
+*** Begin Patch
+*** Update File: foo.txt
+@@ bar
+@@ bar
+-baz
++new
+*** End Patch