diff --git a/codex-rs/apply-patch/tests/fixtures/scenarios/020_whitespace_padded_patch_marker_lines/expected/file.txt b/codex-rs/apply-patch/tests/fixtures/scenarios/023_whitespace_padded_patch_marker_lines/expected/file.txt
similarity index 100%
rename from codex-rs/apply-patch/tests/fixtures/scenarios/020_whitespace_padded_patch_marker_lines/expected/file.txt
rename to codex-rs/apply-patch/tests/fixtures/scenarios/023_whitespace_padded_patch_marker_lines/expected/file.txt
diff --git a/codex-rs/apply-patch/tests/fixtures/scenarios/020_whitespace_padded_patch_marker_lines/input/file.txt b/codex-rs/apply-patch/tests/fixtures/scenarios/023_whitespace_padded_patch_marker_lines/input/file.txt
similarity index 100%
rename from codex-rs/apply-patch/tests/fixtures/scenarios/020_whitespace_padded_patch_marker_lines/input/file.txt
rename to codex-rs/apply-patch/tests/fixtures/scenarios/023_whitespace_padded_patch_marker_lines/input/file.txt
diff --git a/codex-rs/apply-patch/tests/fixtures/scenarios/020_whitespace_padded_patch_marker_lines/patch.txt b/codex-rs/apply-patch/tests/fixtures/scenarios/023_whitespace_padded_patch_marker_lines/patch.txt
similarity index 100%
rename from codex-rs/apply-patch/tests/fixtures/scenarios/020_whitespace_padded_patch_marker_lines/patch.txt
rename to codex-rs/apply-patch/tests/fixtures/scenarios/023_whitespace_padded_patch_marker_lines/patch.txt
diff --git a/codex-rs/apply-patch/tests/fixtures/scenarios/020_multiple_context_lines/expected/first.py b/codex-rs/apply-patch/tests/fixtures/scenarios/024_multiple_context_lines/expected/first.py
similarity index 100%
rename from codex-rs/apply-patch/tests/fixtures/scenarios/020_multiple_context_lines/expected/first.py
rename to codex-rs/apply-patch/tests/fixtures/scenarios/024_multiple_context_lines/expected/first.py
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/024_multiple_context_lines/expected/second.py
similarity index 100%
rename from codex-rs/apply-patch/tests/fixtures/scenarios/020_multiple_context_lines/expected/second.py
rename to codex-rs/apply-patch/tests/fixtures/scenarios/024_multiple_context_lines/expected/second.py
diff --git a/codex-rs/apply-patch/tests/fixtures/scenarios/020_multiple_context_lines/input/first.py b/codex-rs/apply-patch/tests/fixtures/scenarios/024_multiple_context_lines/input/first.py
similarity index 100%
rename from codex-rs/apply-patch/tests/fixtures/scenarios/020_multiple_context_lines/input/first.py
rename to codex-rs/apply-patch/tests/fixtures/scenarios/024_multiple_context_lines/input/first.py
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/024_multiple_context_lines/input/second.py
similarity index 100%
rename from codex-rs/apply-patch/tests/fixtures/scenarios/020_multiple_context_lines/input/second.py
rename to codex-rs/apply-patch/tests/fixtures/scenarios/024_multiple_context_lines/input/second.py
diff --git a/codex-rs/apply-patch/tests/fixtures/scenarios/020_multiple_context_lines/patch.txt b/codex-rs/apply-patch/tests/fixtures/scenarios/024_multiple_context_lines/patch.txt
similarity index 100%
rename from codex-rs/apply-patch/tests/fixtures/scenarios/020_multiple_context_lines/patch.txt
rename to codex-rs/apply-patch/tests/fixtures/scenarios/024_multiple_context_lines/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/025_multiple_context_lines_subset/expected/foo.txt
similarity index 100%
rename from codex-rs/apply-patch/tests/fixtures/scenarios/022_multiple_context_lines_overlap/expected/foo.txt
rename to codex-rs/apply-patch/tests/fixtures/scenarios/025_multiple_context_lines_subset/expected/foo.txt
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/025_multiple_context_lines_subset/input/foo.txt
similarity index 100%
rename from codex-rs/apply-patch/tests/fixtures/scenarios/022_multiple_context_lines_overlap/input/foo.txt
rename to codex-rs/apply-patch/tests/fixtures/scenarios/025_multiple_context_lines_subset/input/foo.txt
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/025_multiple_context_lines_subset/patch.txt
similarity index 100%
rename from codex-rs/apply-patch/tests/fixtures/scenarios/022_multiple_context_lines_overlap/patch.txt
rename to codex-rs/apply-patch/tests/fixtures/scenarios/025_multiple_context_lines_subset/patch.txt
diff --git a/codex-rs/apply-patch/tests/fixtures/scenarios/026_multiple_context_lines_overlap/expected/foo.txt b/codex-rs/apply-patch/tests/fixtures/scenarios/026_multiple_context_lines_overlap/expected/foo.txt
new file mode 100644
index 0000000000..e71f897820
--- /dev/null
+++ b/codex-rs/apply-patch/tests/fixtures/scenarios/026_multiple_context_lines_overlap/expected/foo.txt
@@ -0,0 +1,6 @@
+foo
+bar
+one
+bar
+bar
+two
diff --git a/codex-rs/apply-patch/tests/fixtures/scenarios/026_multiple_context_lines_overlap/input/foo.txt b/codex-rs/apply-patch/tests/fixtures/scenarios/026_multiple_context_lines_overlap/input/foo.txt
new file mode 100644
index 0000000000..63e081d04d
--- /dev/null
+++ b/codex-rs/apply-patch/tests/fixtures/scenarios/026_multiple_context_lines_overlap/input/foo.txt
@@ -0,0 +1,6 @@
+foo
+bar
+bar
+bar
+bar
+baz
diff --git a/codex-rs/apply-patch/tests/fixtures/scenarios/026_multiple_context_lines_overlap/patch.txt b/codex-rs/apply-patch/tests/fixtures/scenarios/026_multiple_context_lines_overlap/patch.txt
new file mode 100644
index 0000000000..c5d176088b
--- /dev/null
+++ b/codex-rs/apply-patch/tests/fixtures/scenarios/026_multiple_context_lines_overlap/patch.txt
@@ -0,0 +1,11 @@
+*** Begin Patch
+*** Update File: foo.txt
+@@ foo
+@@ bar
+-bar
++one
+@@ bar
+@@ bar
+-baz
++two
+*** End Patch
diff --git a/codex-rs/apply-patch/tests/fixtures/scenarios/021_multiple_context_lines_partial_success/expected/failure.py b/codex-rs/apply-patch/tests/fixtures/scenarios/027_multiple_context_lines_partial_success/expected/failure.py
similarity index 69%
rename from codex-rs/apply-patch/tests/fixtures/scenarios/021_multiple_context_lines_partial_success/expected/failure.py
rename to codex-rs/apply-patch/tests/fixtures/scenarios/027_multiple_context_lines_partial_success/expected/failure.py
index 5cc66f8ade..57702a9d21 100644
--- a/codex-rs/apply-patch/tests/fixtures/scenarios/021_multiple_context_lines_partial_success/expected/failure.py
+++ b/codex-rs/apply-patch/tests/fixtures/scenarios/027_multiple_context_lines_partial_success/expected/failure.py
@@ -1,4 +1,4 @@
 class Foo:
-    def foo():
+    def foo(self):
         # to_remove
         pass
diff --git a/codex-rs/apply-patch/tests/fixtures/scenarios/021_multiple_context_lines_partial_success/expected/success.py b/codex-rs/apply-patch/tests/fixtures/scenarios/027_multiple_context_lines_partial_success/expected/success.py
similarity index 69%
rename from codex-rs/apply-patch/tests/fixtures/scenarios/021_multiple_context_lines_partial_success/expected/success.py
rename to codex-rs/apply-patch/tests/fixtures/scenarios/027_multiple_context_lines_partial_success/expected/success.py
index e8c18943e3..dfe9ec73ef 100644
--- a/codex-rs/apply-patch/tests/fixtures/scenarios/021_multiple_context_lines_partial_success/expected/success.py
+++ b/codex-rs/apply-patch/tests/fixtures/scenarios/027_multiple_context_lines_partial_success/expected/success.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/021_multiple_context_lines_partial_success/input/failure.py b/codex-rs/apply-patch/tests/fixtures/scenarios/027_multiple_context_lines_partial_success/input/failure.py
similarity index 69%
rename from codex-rs/apply-patch/tests/fixtures/scenarios/021_multiple_context_lines_partial_success/input/failure.py
rename to codex-rs/apply-patch/tests/fixtures/scenarios/027_multiple_context_lines_partial_success/input/failure.py
index 5cc66f8ade..57702a9d21 100644
--- a/codex-rs/apply-patch/tests/fixtures/scenarios/021_multiple_context_lines_partial_success/input/failure.py
+++ b/codex-rs/apply-patch/tests/fixtures/scenarios/027_multiple_context_lines_partial_success/input/failure.py
@@ -1,4 +1,4 @@
 class Foo:
-    def foo():
+    def foo(self):
         # to_remove
         pass
diff --git a/codex-rs/apply-patch/tests/fixtures/scenarios/021_multiple_context_lines_partial_success/input/success.py b/codex-rs/apply-patch/tests/fixtures/scenarios/027_multiple_context_lines_partial_success/input/success.py
similarity index 69%
rename from codex-rs/apply-patch/tests/fixtures/scenarios/021_multiple_context_lines_partial_success/input/success.py
rename to codex-rs/apply-patch/tests/fixtures/scenarios/027_multiple_context_lines_partial_success/input/success.py
index e8c18943e3..dfe9ec73ef 100644
--- a/codex-rs/apply-patch/tests/fixtures/scenarios/021_multiple_context_lines_partial_success/input/success.py
+++ b/codex-rs/apply-patch/tests/fixtures/scenarios/027_multiple_context_lines_partial_success/input/success.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/021_multiple_context_lines_partial_success/patch.txt b/codex-rs/apply-patch/tests/fixtures/scenarios/027_multiple_context_lines_partial_success/patch.txt
similarity index 79%
rename from codex-rs/apply-patch/tests/fixtures/scenarios/021_multiple_context_lines_partial_success/patch.txt
rename to codex-rs/apply-patch/tests/fixtures/scenarios/027_multiple_context_lines_partial_success/patch.txt
index f29ee6b9b9..83616c36de 100644
--- a/codex-rs/apply-patch/tests/fixtures/scenarios/021_multiple_context_lines_partial_success/patch.txt
+++ b/codex-rs/apply-patch/tests/fixtures/scenarios/027_multiple_context_lines_partial_success/patch.txt
@@ -1,12 +1,12 @@
 *** Begin Patch
 *** Update File: success.py
 @@ class BaseClass:
-@@     def method():
+@@     def method(self):
 -        # to_remove
 +        # to_add
 *** Update File: failure.py
 @@ class Foo:
-@@     def missing():
+@@     def missing(self):
 -        # to_remove
 +        # to_add
 *** End Patch
diff --git a/codex-rs/apply-patch/tests/fixtures/scenarios/028_multiple_context_lines_skipped/expected/skip.py b/codex-rs/apply-patch/tests/fixtures/scenarios/028_multiple_context_lines_skipped/expected/skip.py
new file mode 100644
index 0000000000..2664faaf63
--- /dev/null
+++ b/codex-rs/apply-patch/tests/fixtures/scenarios/028_multiple_context_lines_skipped/expected/skip.py
@@ -0,0 +1,5 @@
+class Foo:
+    # this is a comment
+    def foo(self):
+        # to_add
+        pass
diff --git a/codex-rs/apply-patch/tests/fixtures/scenarios/028_multiple_context_lines_skipped/input/skip.py b/codex-rs/apply-patch/tests/fixtures/scenarios/028_multiple_context_lines_skipped/input/skip.py
new file mode 100644
index 0000000000..52833c728c
--- /dev/null
+++ b/codex-rs/apply-patch/tests/fixtures/scenarios/028_multiple_context_lines_skipped/input/skip.py
@@ -0,0 +1,5 @@
+class Foo:
+    # this is a comment
+    def foo(self):
+        # to_remove
+        pass
diff --git a/codex-rs/apply-patch/tests/fixtures/scenarios/028_multiple_context_lines_skipped/patch.txt b/codex-rs/apply-patch/tests/fixtures/scenarios/028_multiple_context_lines_skipped/patch.txt
new file mode 100644
index 0000000000..4d9a5cacc7
--- /dev/null
+++ b/codex-rs/apply-patch/tests/fixtures/scenarios/028_multiple_context_lines_skipped/patch.txt
@@ -0,0 +1,7 @@
+*** Begin Patch
+*** Update File: skip.py
+@@ class Foo:
+@@     def foo(self):
+-        # to_remove
++        # to_add
+*** End Patch