diff --git a/e2e/testdata/fn-eval/invalid-fn-config-file/pkg/.expected/config.yaml b/e2e/testdata/fn-eval/invalid-fn-config-file/pkg/.expected/config.yaml
index 4575a91770..bcc513614e 100644
--- a/e2e/testdata/fn-eval/invalid-fn-config-file/pkg/.expected/config.yaml
+++ b/e2e/testdata/fn-eval/invalid-fn-config-file/pkg/.expected/config.yaml
@@ -16,4 +16,4 @@ testType: eval
 exitCode: 1
 image: gcr.io/kpt-fn/set-namespace:v0.1.3
 fnConfig: ../../config.yaml
-stdErr: "wrong Node Kind for  expected: MappingNode was ScalarNode: value: {I am not a valid config file}"
+stdErr: "wrong node kind: expected MappingNode but got ScalarNode: node contents:\nI am not a valid config file\n"
diff --git a/pkg/test/runner/util.go b/pkg/test/runner/util.go
index 2831af9342..5ad78c7174 100644
--- a/pkg/test/runner/util.go
+++ b/pkg/test/runner/util.go
@@ -75,7 +75,9 @@ func gitCommit(d, msg string) error {
 }
 
 func gitDiff(d, commit1, commit2 string) (string, error) {
-	stdout, stderr, err := runCommand(getCommand(d, "git", []string{"diff", commit1, commit2}))
+	command := getCommand(d, "git", []string{"diff", commit1, commit2})
+	command.Env = []string{"GIT_DIFF_OPTS="}
+	stdout, stderr, err := runCommand(command)
 	if err != nil {
 		return "", fmt.Errorf("git diff error: %w, output: %s, stderr: %s", err, stdout, stderr)
 	}
diff --git a/porch/controllers/go.mod b/porch/controllers/go.mod
deleted file mode 100644
index 5e3d50778a..0000000000
--- a/porch/controllers/go.mod
+++ /dev/null
@@ -1,10 +0,0 @@
-module github.com/GoogleContainerTools/kpt/porch/controllers
-
-go 1.21
-
-replace (
-	github.com/GoogleContainerTools/kpt => ../../
-	github.com/GoogleContainerTools/kpt/porch => ../
-	github.com/GoogleContainerTools/kpt/porch/api => ../api
-	github.com/go-git/go-git/v5 v5.4.3-0.20220408232334-4f916225cb2f => github.com/platkrm/go-git/v5 v5.4.3-0.20220410165046-c76b262044ce
-)
diff --git a/porch/controllers/go.sum b/porch/controllers/go.sum
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/porch/go.mod b/porch/go.mod
deleted file mode 100644
index a8fdd21e06..0000000000
--- a/porch/go.mod
+++ /dev/null
@@ -1,9 +0,0 @@
-module github.com/GoogleContainerTools/kpt/porch
-
-go 1.21
-
-replace (
-	github.com/GoogleContainerTools/kpt => ../
-	github.com/GoogleContainerTools/kpt/porch/api => ./api
-	github.com/go-git/go-git/v5 v5.4.3-0.20220408232334-4f916225cb2f => github.com/platkrm/go-git/v5 v5.4.3-0.20220410165046-c76b262044ce
-)
diff --git a/porch/go.sum b/porch/go.sum
deleted file mode 100644
index e69de29bb2..0000000000