diff --git a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/navigation/GoToPluginTest.java b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/navigation/GoToPluginTest.java
index 1002e1a333..9cc2bf8323 100644
--- a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/navigation/GoToPluginTest.java
+++ b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/navigation/GoToPluginTest.java
@@ -772,7 +772,7 @@ public class GoToPluginTest extends AbstractGhidraHeadedIntegrationTest {
 	private void setOptionToAllowNavigationToOtherOpenPrograms() throws Exception {
 		runSwing(() -> {
 			ToolOptions options = tool.getOptions("Navigation");
-			options.setBoolean("'Go To' in current program only", false);
+			options.setBoolean("'Go To' in Current Program Only", false);
 		});
 	}
 
diff --git a/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/framework/main/datatree/VersionControlAction1Test.java b/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/framework/main/datatree/VersionControlAction1Test.java
index 3e4cb088fe..bb753c6c4a 100644
--- a/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/framework/main/datatree/VersionControlAction1Test.java
+++ b/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/framework/main/datatree/VersionControlAction1Test.java
@@ -213,18 +213,16 @@ public class VersionControlAction1Test extends AbstractVersionControlActionTest
 		waitForTasks();
 
 		// make some changes to check in
-		Program program = (Program) ((DomainFileNode) node).getDomainFile()
-				.getDomainObject(this,
-					true, false, TaskMonitor.DUMMY);
+		Program program = (Program) ((DomainFileNode) node).getDomainFile().getDomainObject(this,
+			true, false, TaskMonitor.DUMMY);
 		editProgram(program, (p) -> {
 			SymbolTable symTable = p.getSymbolTable();
 			symTable.createLabel(p.getMinAddress().getNewAddress(0x010001000), "fred",
 				SourceType.USER_DEFINED);
 		});
 
-		program = (Program) ((DomainFileNode) xnode).getDomainFile()
-				.getDomainObject(this, true,
-					false, TaskMonitor.DUMMY);
+		program = (Program) ((DomainFileNode) xnode).getDomainFile().getDomainObject(this, true,
+			false, TaskMonitor.DUMMY);
 		editProgram(program, (p) -> {
 			SymbolTable symTable = p.getSymbolTable();
 			symTable.createLabel(p.getMinAddress(), "bob", SourceType.USER_DEFINED);
@@ -253,9 +251,8 @@ public class VersionControlAction1Test extends AbstractVersionControlActionTest
 		checkout(programNode);
 
 		Program program =
-			(Program) ((DomainFileNode) programNode).getDomainFile()
-					.getDomainObject(this, true,
-						false, TaskMonitor.DUMMY);
+			(Program) ((DomainFileNode) programNode).getDomainFile().getDomainObject(this, true,
+				false, TaskMonitor.DUMMY);
 
 		createHistoryEntry(program, "Symbol1");
 		frontEnd.checkIn(programNode, "This is checkin 1");
@@ -608,8 +605,9 @@ public class VersionControlAction1Test extends AbstractVersionControlActionTest
 		selectInTable(table, node);
 
 		DockingActionIf undoCheckoutAction = getAction("UndoCheckOut");
-		assertTrue(undoCheckoutAction.isEnabledForContext(dialog.getActionContext(null)));
-		performAction(undoCheckoutAction);
+		ActionContext actionContext = dialog.getActionContext(null);
+		assertTrue(undoCheckoutAction.isEnabledForContext(actionContext));
+		performAction(undoCheckoutAction, actionContext, true);
 
 		waitForBusyTable(table);
 		assertEquals(1, model.getRowCount());