diff --git a/DiffTests/DiffTests.swift b/DiffTests/DiffTests.swift
index f7d7edc..dd16a93 100644
--- a/DiffTests/DiffTests.swift
+++ b/DiffTests/DiffTests.swift
@@ -80,9 +80,7 @@ class DiffTests: XCTestCase {
 
     func testTracesOutOfBounds() {
         for expectation in expectations {
-            if tracesOutOfBounds(from: expectation.0, to: expectation.1) != [] {
-                XCTFail("traces out of bounds for \(expectation.0) -> \(expectation.1)")
-            }
+            XCTAssertEqual(tracesOutOfBounds(from: expectation.0, to: expectation.1), [], "traces out of bounds for \(expectation.0) -> \(expectation.1)")
         }
     }
 
diff --git a/DiffTests/ExtendedPatchSortTests.swift b/DiffTests/ExtendedPatchSortTests.swift
index ca8f2ee..1aafdae 100644
--- a/DiffTests/ExtendedPatchSortTests.swift
+++ b/DiffTests/ExtendedPatchSortTests.swift
@@ -53,6 +53,7 @@ class ExtendedPatchSortTests: XCTestCase {
         let expectations = [
             ("gitten", "sitting", "D(4)M(0,4)I(0,s)I(4,i)"),
             ("1362", "31526", "M(0,2)M(1,3)I(2,5)"),
+            ("a1b2c3pq", "3sa1cz2rb", "D(7)D(6)M(5,0)M(3,5)M(3,4)I(1,s)I(5,z)I(7,r)"),
         ]
 
         let sort: ExtendedSortingFunction = { fst, snd in
diff --git a/DiffTests/PatchSortTests.swift b/DiffTests/PatchSortTests.swift
index 0112e9e..de409aa 100644
--- a/DiffTests/PatchSortTests.swift
+++ b/DiffTests/PatchSortTests.swift
@@ -51,13 +51,12 @@ class PatchTests: XCTestCase {
             switch (element1, element2) {
             case (.insert(let at1), .insert(let at2)):
                 return at1 < at2
-            case (.insert, .delete):
+            case (.insert(_), .delete(_)):
                 return true
-            case (.delete, .insert):
+            case (.delete(_), .insert(_)):
                 return false
             case (.delete(let at1), .delete(let at2)):
                 return at1 < at2
-            default: fatalError()
             }
         }
 
@@ -93,13 +92,12 @@ class PatchTests: XCTestCase {
             switch (element1, element2) {
             case (.insert(let at1), .insert(let at2)):
                 return at1 < at2
-            case (.insert, .delete):
+            case (.insert(_), .delete(_)):
                 return false
-            case (.delete, .insert):
+            case (.delete(_), .insert(_)):
                 return true
             case (.delete(let at1), .delete(let at2)):
                 return at1 < at2
-            default: fatalError()
             }
         }