diff --git a/test/corpus/diff-summaries/go/go-and-defer-statements.json b/test/corpus/diff-summaries/go/go-and-defer-statements.json
index 169007c3d..91888b436 100644
--- a/test/corpus/diff-summaries/go/go-and-defer-statements.json
+++ b/test/corpus/diff-summaries/go/go-and-defer-statements.json
@@ -8,7 +8,7 @@
                         "insert": {
                             "start": [
                                 1,
-                                1
+                                7
                             ],
                             "end": [
                                 1,
@@ -16,7 +16,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'x[y]()' defer statement"
+                    "summary": "Added the 'x[y]()' function call"
                 },
                 {
                     "span": {
@@ -50,7 +50,7 @@
         "+go x.y()"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "201c2f06d17d14e12c9861e2a94372fc41441178..4c2c5d9bf86b0e00910db4151d8cb1be6e261245"
+    "shas": "aa6d103c0bde1c5cd7c122b6a597939f9920694d..39d794d96184f5c24d53575d9acf0c1408848019"
 }
 ,{
     "testCaseDescription": "go-go-and-defer-statements-replacement-insert-test",
@@ -116,6 +116,36 @@
                         }
                     },
                     "summary": "Added the 'x[y]()' go statement"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                5,
+                                1
+                            ],
+                            "end": [
+                                5,
+                                12
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'x[y]()' defer statement"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                1,
+                                7
+                            ],
+                            "end": [
+                                1,
+                                12
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'x[y]()' function call"
                 }
             ]
         },
@@ -138,7 +168,7 @@
         " go x.y()"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "4c2c5d9bf86b0e00910db4151d8cb1be6e261245..0af27bad18af4c3f10e18adf6824bc24be7cdf18"
+    "shas": "39d794d96184f5c24d53575d9acf0c1408848019..f00940bceca8647dfc5c03a16d11fa77b65605ab"
 }
 ,{
     "testCaseDescription": "go-go-and-defer-statements-delete-insert-test",
@@ -275,7 +305,7 @@
         " defer x.y()"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "0af27bad18af4c3f10e18adf6824bc24be7cdf18..e8853de747eee3ecdd93e3344be1e54dbc28e8fe"
+    "shas": "f00940bceca8647dfc5c03a16d11fa77b65605ab..a438dd8c1ac73cefd028b38d896c9e7150693fda"
 }
 ,{
     "testCaseDescription": "go-go-and-defer-statements-replacement-test",
@@ -412,7 +442,7 @@
         " defer x.y()"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "e8853de747eee3ecdd93e3344be1e54dbc28e8fe..baf0c568b56a2909465365b10b1764e574ffdcbf"
+    "shas": "a438dd8c1ac73cefd028b38d896c9e7150693fda..be9ca54744a56600853a24a3574f6a9372317a4e"
 }
 ,{
     "testCaseDescription": "go-go-and-defer-statements-delete-replacement-test",
@@ -532,13 +562,28 @@
         "+go c.d()"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "baf0c568b56a2909465365b10b1764e574ffdcbf..8449fd5df5a995e61d8ca8b450f83468e79a5246"
+    "shas": "be9ca54744a56600853a24a3574f6a9372317a4e..8aed3cad89b295cbb44d0af3d14a133805b21092"
 }
 ,{
     "testCaseDescription": "go-go-and-defer-statements-delete-test",
     "expectedResult": {
         "changes": {
             "go-and-defer-statements.go": [
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                1,
+                                7
+                            ],
+                            "end": [
+                                1,
+                                12
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'a[b]()' function call"
+                },
                 {
                     "span": {
                         "delete": {
@@ -568,6 +613,21 @@
                         }
                     },
                     "summary": "Deleted the 'x[y]()' go statement"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                3,
+                                12
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'a[b]()' defer statement"
                 }
             ]
         },
@@ -588,7 +648,7 @@
         " go c.d()"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "8449fd5df5a995e61d8ca8b450f83468e79a5246..129278c1c54e5bcd112a0f7bc5a4876b0890b5a9"
+    "shas": "8aed3cad89b295cbb44d0af3d14a133805b21092..2597c988897b6b96cb121f2abfda7a34f3a2e78a"
 }
 ,{
     "testCaseDescription": "go-go-and-defer-statements-delete-rest-test",
@@ -600,7 +660,7 @@
                         "delete": {
                             "start": [
                                 1,
-                                1
+                                7
                             ],
                             "end": [
                                 1,
@@ -608,7 +668,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'a[b]()' defer statement"
+                    "summary": "Deleted the 'a[b]()' function call"
                 },
                 {
                     "span": {
@@ -642,5 +702,5 @@
         "-go c.d()"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "129278c1c54e5bcd112a0f7bc5a4876b0890b5a9..13fa148e00739eba43f10562e024e15d2fc7e5d9"
+    "shas": "2597c988897b6b96cb121f2abfda7a34f3a2e78a..1b6e0feb56e5cdb7ad291617f2f0435417e65665"
 }]
diff --git a/test/corpus/diff-summaries/go/selector-expressions.json b/test/corpus/diff-summaries/go/selector-expressions.json
index 1b21f9ab3..8eee2f00f 100644
--- a/test/corpus/diff-summaries/go/selector-expressions.json
+++ b/test/corpus/diff-summaries/go/selector-expressions.json
@@ -34,7 +34,7 @@
         "+a.b.c()"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "b8520b47d7e23a8b805613ba5e28d123748a7e86..53e9575bb4a95b6a13a9289b3cb198389c3c5018"
+    "shas": "1b6e0feb56e5cdb7ad291617f2f0435417e65665..1cabbfb616bb7f16666511f145e8709354b162c1"
 }
 ,{
     "testCaseDescription": "go-selector-expressions-replacement-insert-test",
@@ -70,6 +70,36 @@
                         }
                     },
                     "summary": "Added the 'a[b][c]()' function call"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                3,
+                                8
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'a[b][c]()' function call"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                1,
+                                1
+                            ],
+                            "end": [
+                                1,
+                                8
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'a[b][c]()' function call"
                 }
             ]
         },
@@ -89,7 +119,7 @@
         " a.b.c()"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "53e9575bb4a95b6a13a9289b3cb198389c3c5018..05337c7344ffd11906be9b6603043c1bcf0f7dff"
+    "shas": "1cabbfb616bb7f16666511f145e8709354b162c1..9cd2e1fa67eaf8b7701eb693cbde0abf05a9acf2"
 }
 ,{
     "testCaseDescription": "go-selector-expressions-delete-insert-test",
@@ -196,7 +226,7 @@
         " a.b.c()"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "05337c7344ffd11906be9b6603043c1bcf0f7dff..4bcafdd401ffbfb0e29802793ed59f20908986a6"
+    "shas": "9cd2e1fa67eaf8b7701eb693cbde0abf05a9acf2..87e2a67ff089313ce73948c33f5fed26678e69e6"
 }
 ,{
     "testCaseDescription": "go-selector-expressions-replacement-test",
@@ -303,7 +333,7 @@
         " a.b.c()"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "4bcafdd401ffbfb0e29802793ed59f20908986a6..1763e869f9b7050dc5703f293808233c46910062"
+    "shas": "87e2a67ff089313ce73948c33f5fed26678e69e6..8288366db7745d5e945597239e1e3e9e7384f986"
 }
 ,{
     "testCaseDescription": "go-selector-expressions-delete-replacement-test",
@@ -374,13 +404,28 @@
         "+x.y.z()"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "1763e869f9b7050dc5703f293808233c46910062..562bbf82089ed1bc7d77c4698451746939455f51"
+    "shas": "8288366db7745d5e945597239e1e3e9e7384f986..6320cb015ad06170d57469ad6117980fcf530917"
 }
 ,{
     "testCaseDescription": "go-selector-expressions-delete-test",
     "expectedResult": {
         "changes": {
             "selector-expressions.go": [
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                1,
+                                1
+                            ],
+                            "end": [
+                                1,
+                                8
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'x[y][z]()' function call"
+                },
                 {
                     "span": {
                         "delete": {
@@ -395,6 +440,21 @@
                         }
                     },
                     "summary": "Deleted the 'a[b][c]()' function call"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                2,
+                                1
+                            ],
+                            "end": [
+                                2,
+                                8
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'x[y][z]()' function call"
                 }
             ]
         },
@@ -413,7 +473,7 @@
         " x.y.z()"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "562bbf82089ed1bc7d77c4698451746939455f51..3ea379fb7d49d67e17b2bd53b58af0298c055ccc"
+    "shas": "6320cb015ad06170d57469ad6117980fcf530917..64072b885bd8b401823412418b0a634151fb012c"
 }
 ,{
     "testCaseDescription": "go-selector-expressions-delete-rest-test",
@@ -451,5 +511,5 @@
         "-x.y.z()"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "3ea379fb7d49d67e17b2bd53b58af0298c055ccc..bef4b21e0fe9824b79e8b12bfa32867c8a4433a7"
+    "shas": "64072b885bd8b401823412418b0a634151fb012c..5e49cf8bc49a6acceee67258f44392614d3e2807"
 }]
diff --git a/test/corpus/diff-summaries/go/type-assertion-expressions.json b/test/corpus/diff-summaries/go/type-assertion-expressions.json
index 47dae760e..f1fdbd032 100644
--- a/test/corpus/diff-summaries/go/type-assertion-expressions.json
+++ b/test/corpus/diff-summaries/go/type-assertion-expressions.json
@@ -34,7 +34,7 @@
         "+x.(z.Person)"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "fff4b5e3aa207b2f8d5dc8ddb03b550f79baec95..7cdaee711fdf7f7a97fc3269e28626252a4dc3dc"
+    "shas": "47d2e77075bea143df064341695111f434390787..012b1aebf2431d713e5287b10792aa564b72d6bc"
 }
 ,{
     "testCaseDescription": "go-type-assertion-expressions-replacement-insert-test",
@@ -70,6 +70,36 @@
                         }
                     },
                     "summary": "Added the 'x.(z.Person)' type assertion statement"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                3,
+                                1
+                            ],
+                            "end": [
+                                3,
+                                13
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'x.(z.Person)' type assertion statement"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                1,
+                                1
+                            ],
+                            "end": [
+                                1,
+                                13
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'x.(z.Person)' type assertion statement"
                 }
             ]
         },
@@ -89,7 +119,7 @@
         " x.(z.Person)"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "7cdaee711fdf7f7a97fc3269e28626252a4dc3dc..2bccd29b12d301d0fa0744e890ae3afdba1f43bc"
+    "shas": "012b1aebf2431d713e5287b10792aa564b72d6bc..65901508a1a56b8fd65f1c704be9ebdb7c0e9962"
 }
 ,{
     "testCaseDescription": "go-type-assertion-expressions-delete-insert-test",
@@ -196,7 +226,7 @@
         " x.(z.Person)"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "2bccd29b12d301d0fa0744e890ae3afdba1f43bc..b774e03f1513e1139f22bbc3e116e2ff17168247"
+    "shas": "65901508a1a56b8fd65f1c704be9ebdb7c0e9962..cf149b0f32f8c6e2111d7e24f6384ef8a7465ed3"
 }
 ,{
     "testCaseDescription": "go-type-assertion-expressions-replacement-test",
@@ -303,7 +333,7 @@
         " x.(z.Person)"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "b774e03f1513e1139f22bbc3e116e2ff17168247..596b57a4b9a75038c3f5594caa3561a52de5dc16"
+    "shas": "cf149b0f32f8c6e2111d7e24f6384ef8a7465ed3..2785ff758a864fb059f1d3a640356184e685c7ae"
 }
 ,{
     "testCaseDescription": "go-type-assertion-expressions-delete-replacement-test",
@@ -374,13 +404,28 @@
         "+b.(c.Dog)"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "596b57a4b9a75038c3f5594caa3561a52de5dc16..b9105039f8d9f039416e98ced5b9e80b8f7c7d40"
+    "shas": "2785ff758a864fb059f1d3a640356184e685c7ae..2747f7daa786f2a814e7e8381120d838050d1d89"
 }
 ,{
     "testCaseDescription": "go-type-assertion-expressions-delete-test",
     "expectedResult": {
         "changes": {
             "type-assertion-expressions.go": [
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                1,
+                                1
+                            ],
+                            "end": [
+                                1,
+                                10
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'b.(c.Dog)' type assertion statement"
+                },
                 {
                     "span": {
                         "delete": {
@@ -395,6 +440,21 @@
                         }
                     },
                     "summary": "Deleted the 'x.(z.Person)' type assertion statement"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                2,
+                                1
+                            ],
+                            "end": [
+                                2,
+                                10
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'b.(c.Dog)' type assertion statement"
                 }
             ]
         },
@@ -413,7 +473,7 @@
         " b.(c.Dog)"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "b9105039f8d9f039416e98ced5b9e80b8f7c7d40..868316791e7a76d17ffd45113d8b0a74886f8c90"
+    "shas": "2747f7daa786f2a814e7e8381120d838050d1d89..f710680272400bb3cfcdca84cbc9a46dc3e136ba"
 }
 ,{
     "testCaseDescription": "go-type-assertion-expressions-delete-rest-test",
@@ -451,5 +511,5 @@
         "-b.(c.Dog)"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "868316791e7a76d17ffd45113d8b0a74886f8c90..5f76f266d80a0de28bb0535282f740664c37c11d"
+    "shas": "f710680272400bb3cfcdca84cbc9a46dc3e136ba..aa6d103c0bde1c5cd7c122b6a597939f9920694d"
 }]
diff --git a/test/corpus/diff-summaries/go/type-declarations.json b/test/corpus/diff-summaries/go/type-declarations.json
index 380b9aca3..74f845ef0 100644
--- a/test/corpus/diff-summaries/go/type-declarations.json
+++ b/test/corpus/diff-summaries/go/type-declarations.json
@@ -113,7 +113,7 @@
         "+ )"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "ba18dfa94bdd542c6e02a9537056dd589dd722da..e00fa9b114014263f5eb860c1f568232d8c2e636"
+    "shas": "e560ba24e6b3318aeaaa38fbba2567add6762706..bae5319a920b125fee9eaf9759a92aa5da2e3532"
 }
 ,{
     "testCaseDescription": "go-type-declarations-replacement-insert-test",
@@ -433,7 +433,7 @@
         "  a b"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "e00fa9b114014263f5eb860c1f568232d8c2e636..df0f0782bba768dcdd8cd44c995b372509bc946c"
+    "shas": "bae5319a920b125fee9eaf9759a92aa5da2e3532..e1cbc86ed6adfff25935ae2fde6e52e0f7944faf"
 }
 ,{
     "testCaseDescription": "go-type-declarations-delete-insert-test",
@@ -930,7 +930,7 @@
         " type ("
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "df0f0782bba768dcdd8cd44c995b372509bc946c..cfe798aea18d3224e069fa338a9ffbf7e8596517"
+    "shas": "e1cbc86ed6adfff25935ae2fde6e52e0f7944faf..fb8f71e56f7c782c5c103939810a573235d96eed"
 }
 ,{
     "testCaseDescription": "go-type-declarations-replacement-test",
@@ -1427,7 +1427,7 @@
         " type ("
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "cfe798aea18d3224e069fa338a9ffbf7e8596517..92756bc9c8de8ac798d9c5a96fed709990ef6f26"
+    "shas": "fb8f71e56f7c782c5c103939810a573235d96eed..5b0a2d7fcff950132d300c821807689289a9953a"
 }
 ,{
     "testCaseDescription": "go-type-declarations-delete-replacement-test",
@@ -1524,6 +1524,21 @@
                     },
                     "summary": "Added the 'd' identifier"
                 },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                6,
+                                6
+                            ],
+                            "end": [
+                                6,
+                                7
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'a' identifier"
+                },
                 {
                     "span": {
                         "insert": {
@@ -1569,21 +1584,6 @@
                     },
                     "summary": "Added the ''\n' ERROR"
                 },
-                {
-                    "span": {
-                        "insert": {
-                            "start": [
-                                8,
-                                2
-                            ],
-                            "end": [
-                                8,
-                                3
-                            ]
-                        }
-                    },
-                    "summary": "Added the 'a' identifier"
-                },
                 {
                     "span": {
                         "insert": {
@@ -1992,7 +1992,7 @@
         "  )"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "92756bc9c8de8ac798d9c5a96fed709990ef6f26..e72df0b090fe30087548209c4dc301b9729fc594"
+    "shas": "5b0a2d7fcff950132d300c821807689289a9953a..28961b1c59a82635b9174f3e1a492635af8449ce"
 }
 ,{
     "testCaseDescription": "go-type-declarations-delete-test",
@@ -2112,7 +2112,7 @@
         "  a' b'"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "e72df0b090fe30087548209c4dc301b9729fc594..f66688eab0c288423dcf1b1ead3f534f4272125b"
+    "shas": "28961b1c59a82635b9174f3e1a492635af8449ce..574d1837a6533c222449e99ca08b246dfd4db51b"
 }
 ,{
     "testCaseDescription": "go-type-declarations-delete-rest-test",
@@ -2319,5 +2319,5 @@
         "- )"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "f66688eab0c288423dcf1b1ead3f534f4272125b..eab68be4fe73c7ea63793058e38316a7eab75064"
+    "shas": "574d1837a6533c222449e99ca08b246dfd4db51b..47d2e77075bea143df064341695111f434390787"
 }]
diff --git a/test/corpus/diff-summaries/go/unary-expressions.json b/test/corpus/diff-summaries/go/unary-expressions.json
index 30437f3b9..170301bf4 100644
--- a/test/corpus/diff-summaries/go/unary-expressions.json
+++ b/test/corpus/diff-summaries/go/unary-expressions.json
@@ -23,7 +23,7 @@
                         "insert": {
                             "start": [
                                 2,
-                                1
+                                2
                             ],
                             "end": [
                                 2,
@@ -31,7 +31,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'identifier()' function call"
+                    "summary": "Added the 'foo()' function call"
                 }
             ]
         },
@@ -50,7 +50,7 @@
         "+*foo()"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "3403cd75b5874d1bc6c4c3c737525b7bd1271113..25caa48897bbba94e3ebd10df0cab8c1af27c26d"
+    "shas": "0c22b7aa63a02fe2ddea7a2e3531e1bf778729a1..a853d892401554051aac78581481f205834001a0"
 }
 ,{
     "testCaseDescription": "go-unary-expressions-replacement-insert-test",
@@ -77,7 +77,7 @@
                         "insert": {
                             "start": [
                                 2,
-                                1
+                                2
                             ],
                             "end": [
                                 2,
@@ -85,7 +85,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'identifier()' function call"
+                    "summary": "Added the 'bar()' function call"
                 },
                 {
                     "span": {
@@ -102,12 +102,27 @@
                     },
                     "summary": "Added the 'a' identifier"
                 },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                1,
+                                4
+                            ],
+                            "end": [
+                                1,
+                                5
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'a' identifier"
+                },
                 {
                     "span": {
                         "insert": {
                             "start": [
                                 4,
-                                1
+                                2
                             ],
                             "end": [
                                 4,
@@ -115,7 +130,22 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'identifier()' function call"
+                    "summary": "Added the 'foo()' function call"
+                },
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                5,
+                                4
+                            ],
+                            "end": [
+                                5,
+                                5
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'a' identifier"
                 }
             ]
         },
@@ -138,7 +168,7 @@
         " *foo()"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "25caa48897bbba94e3ebd10df0cab8c1af27c26d..75a33545386bf76a55b02340bd336b00602e323e"
+    "shas": "a853d892401554051aac78581481f205834001a0..bad62bb53ba866eebb82de0daba4d2af96bada50"
 }
 ,{
     "testCaseDescription": "go-unary-expressions-delete-insert-test",
@@ -197,7 +227,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'bar' identifier with the 'foo' identifier in the identifier() function call"
+                    "summary": "Replaced the 'bar' identifier with the 'foo' identifier in the foo() function call"
                 }
             ]
         },
@@ -221,7 +251,7 @@
         " !<-a"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "75a33545386bf76a55b02340bd336b00602e323e..32474c2bac0758793a5ff0f2139cab878545163a"
+    "shas": "bad62bb53ba866eebb82de0daba4d2af96bada50..b3d8517142703695ff4ae6bbbfdae7a8131d62e3"
 }
 ,{
     "testCaseDescription": "go-unary-expressions-replacement-test",
@@ -280,7 +310,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'foo' identifier with the 'bar' identifier in the identifier() function call"
+                    "summary": "Replaced the 'foo' identifier with the 'bar' identifier in the bar() function call"
                 }
             ]
         },
@@ -304,7 +334,7 @@
         " !<-a"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "32474c2bac0758793a5ff0f2139cab878545163a..36454e266744a461ca2dd6934a061dc63a7c7a63"
+    "shas": "b3d8517142703695ff4ae6bbbfdae7a8131d62e3..851012d113a37b9c98e94b82cd1e32ebdc8be638"
 }
 ,{
     "testCaseDescription": "go-unary-expressions-delete-replacement-test",
@@ -331,7 +361,7 @@
                         "delete": {
                             "start": [
                                 2,
-                                1
+                                2
                             ],
                             "end": [
                                 2,
@@ -339,7 +369,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'identifier()' function call"
+                    "summary": "Deleted the 'bar()' function call"
                 },
                 {
                     "span": {
@@ -361,7 +391,7 @@
                         "delete": {
                             "start": [
                                 4,
-                                1
+                                2
                             ],
                             "end": [
                                 4,
@@ -369,7 +399,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'identifier()' function call"
+                    "summary": "Deleted the 'foo()' function call"
                 },
                 {
                     "span": {
@@ -391,7 +421,7 @@
                         "insert": {
                             "start": [
                                 4,
-                                1
+                                2
                             ],
                             "end": [
                                 4,
@@ -399,7 +429,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'identifier()' function call"
+                    "summary": "Added the 'bar()' function call"
                 }
             ]
         },
@@ -424,13 +454,28 @@
         "+*bar()"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "36454e266744a461ca2dd6934a061dc63a7c7a63..2c0c14abd00ce4615876508894c87c15ad9f49e3"
+    "shas": "851012d113a37b9c98e94b82cd1e32ebdc8be638..163450da5968971b4c4d6ee24b6ffc76e87ff860"
 }
 ,{
     "testCaseDescription": "go-unary-expressions-delete-test",
     "expectedResult": {
         "changes": {
             "unary-expressions.go": [
+                {
+                    "span": {
+                        "insert": {
+                            "start": [
+                                1,
+                                4
+                            ],
+                            "end": [
+                                1,
+                                5
+                            ]
+                        }
+                    },
+                    "summary": "Added the 'b' identifier"
+                },
                 {
                     "span": {
                         "delete": {
@@ -451,7 +496,7 @@
                         "delete": {
                             "start": [
                                 2,
-                                1
+                                2
                             ],
                             "end": [
                                 2,
@@ -459,7 +504,22 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'identifier()' function call"
+                    "summary": "Deleted the 'foo()' function call"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                3,
+                                4
+                            ],
+                            "end": [
+                                3,
+                                5
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'b' identifier"
                 }
             ]
         },
@@ -480,7 +540,7 @@
         " *bar()"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "2c0c14abd00ce4615876508894c87c15ad9f49e3..742cb3cf4d2b7f71864c7795fd3307b8775538b3"
+    "shas": "163450da5968971b4c4d6ee24b6ffc76e87ff860..f47634134cc46cd539cef45bcf6090feb116ebb9"
 }
 ,{
     "testCaseDescription": "go-unary-expressions-delete-rest-test",
@@ -507,7 +567,7 @@
                         "delete": {
                             "start": [
                                 2,
-                                1
+                                2
                             ],
                             "end": [
                                 2,
@@ -515,7 +575,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'identifier()' function call"
+                    "summary": "Deleted the 'bar()' function call"
                 }
             ]
         },
@@ -534,5 +594,5 @@
         "-*bar()"
     ],
     "gitDir": "test/corpus/repos/go",
-    "shas": "742cb3cf4d2b7f71864c7795fd3307b8775538b3..ecfd8333e0e37929a8029b0c03cec13c31e0f692"
+    "shas": "f47634134cc46cd539cef45bcf6090feb116ebb9..e560ba24e6b3318aeaaa38fbba2567add6762706"
 }]
diff --git a/test/corpus/generated/new_go.json b/test/corpus/generated/new_go.json
new file mode 100644
index 000000000..72a54d062
--- /dev/null
+++ b/test/corpus/generated/new_go.json
@@ -0,0 +1,20 @@
+[
+  {
+    "repoUrl": "https://github.com/joshvera/go.git",
+    "language": "go",
+    "fileExt": ".go",
+    "templateText": "package main\n",
+    "syntaxes": [
+      {
+        "syntax": "go-and-defer-statements",
+        "insert": "defer x.y()\ngo x.y()",
+        "replacement": "defer a.b()\ngo c.d()"
+      },
+      {
+        "syntax": "selector-expressions",
+        "insert": "a.b.c()",
+        "replacement": "x.y.z()"
+      }
+    ]
+  }
+]
diff --git a/test/corpus/repos/go b/test/corpus/repos/go
index 9a8e60783..5e49cf8bc 160000
--- a/test/corpus/repos/go
+++ b/test/corpus/repos/go
@@ -1 +1 @@
-Subproject commit 9a8e607838c835f05173da887153445f52079f01
+Subproject commit 5e49cf8bc49a6acceee67258f44392614d3e2807