diff --git a/client/client_test.go b/client/client_test.go
index 3a1c8de..452efb2 100644
--- a/client/client_test.go
+++ b/client/client_test.go
@@ -1704,15 +1704,18 @@ func TestFish(t *testing.T) {
 		"ENTER",
 		"SPACE echo SPACE baz ENTER",
 		"echo SPACE bar ENTER",
-		"ls SPACE /tmp/ ENTER",
+		"echo SPACE '\"foo\"' ENTER",
 		"SPACE echo SPACE foobar ENTER",
 		"ls SPACE /bar/ SPACE '&' ENTER",
 	})
-	compareGoldens(t, out, "TestFish-capturedPane")
+	if os.Getenv("GITHUB_ACTION") == "" {
+		// This bit is broken on actions since actions run as a different user
+		compareGoldens(t, out, "TestFish-capturedPane")
+	}
 
 	// Check export
 	out = tester.RunInteractiveShell(t, `hishtory export | grep -v pipefail | grep -v ps`)
-	expectedOutput := "echo foo\necho bar\nls /tmp/\nls /bar/ &\n"
+	expectedOutput := "echo foo\necho bar\necho \"foo\"\nls /bar/ &\n"
 	if diff := cmp.Diff(expectedOutput, out); diff != "" {
 		t.Fatalf("hishtory export mismatch (-expected +got):\n%s\nout=%#v", diff, out)
 	}
@@ -1828,10 +1831,6 @@ func captureTerminalOutputWithShellName(t *testing.T, tester shellTester, overri
 }
 
 func testControlR(t *testing.T, tester shellTester, shellName string) {
-	// if os.Getenv("GITHUB_ACTION") != "" && runtime.GOOS == "darwin" && shellName == "bash" {
-	// t.Skip() // TODO: further debug this. example failure: https://github.com/ddworken/hishtory/actions/runs/3309097201/jobs/5461940137
-	// }
-
 	// Setup
 	defer testutils.BackupAndRestore(t)()
 	installHishtory(t, tester, "")
diff --git a/client/lib/goldens/TestFish-capturedPane b/client/lib/goldens/TestFish-capturedPane
index 86eb12e..63f5ce3 100644
--- a/client/lib/goldens/TestFish-capturedPane
+++ b/client/lib/goldens/TestFish-capturedPane
@@ -7,9 +7,8 @@ david@Davids-MacBook-Air />  echo baz
 baz
 david@Davids-MacBook-Air /> echo bar
 bar
-david@Davids-MacBook-Air /> ls /tmp/
-client*                       com.google.Keystone/          powerlog/                     tmux-501/
-com.apple.launchd.vphqfEpkYH/ fseventsd-uuid                server*
+david@Davids-MacBook-Air /> echo "foo"
+foo
 david@Davids-MacBook-Air />  echo foobar
 foobar
 david@Davids-MacBook-Air /> ls /bar/ &
diff --git a/client/lib/goldens/TestFish-table b/client/lib/goldens/TestFish-table
index 5859f9b..e2cebcd 100644
--- a/client/lib/goldens/TestFish-table
+++ b/client/lib/goldens/TestFish-table
@@ -1,6 +1,6 @@
 CWD  Hostname                  Exit Code  Command                                                                 
 /    ghaction-runner-hostname  0          hishtory config-set displayed-columns CWD Hostname 'Exit Code' Command  
 /    ghaction-runner-hostname  1          ls /bar/ &                                                              
-/    ghaction-runner-hostname  0          ls /tmp/                                                                
+/    ghaction-runner-hostname  0          echo "foo"                                                              
 /    ghaction-runner-hostname  0          echo bar                                                                
 /    ghaction-runner-hostname  0          echo foo