diff --git a/Ghidra/Debug/Framework-TraceModeling/src/test/java/ghidra/trace/model/time/schedule/TestThread.java b/Ghidra/Debug/Framework-TraceModeling/src/test/java/ghidra/trace/model/time/schedule/TestThread.java
index 5d1ed828f3..b0b27ea3c2 100644
--- a/Ghidra/Debug/Framework-TraceModeling/src/test/java/ghidra/trace/model/time/schedule/TestThread.java
+++ b/Ghidra/Debug/Framework-TraceModeling/src/test/java/ghidra/trace/model/time/schedule/TestThread.java
@@ -61,14 +61,7 @@ class TestThread implements PcodeThread<Void> {
 
 	@Override
 	public PcodeExecutor<Void> getExecutor() {
-		return new PcodeExecutor<>(TraceScheduleTest.TOY_BE_64_LANG, machine.getArithmetic(),
-			getState(), Reason.EXECUTE_READ) {
-			public PcodeFrame execute(PcodeProgram program, PcodeUseropLibrary<Void> library) {
-				machine.record.add("x:" + name);
-				// TODO: Verify the actual effect
-				return null; //super.execute(program, library);
-			}
-		};
+		return new PcodeExecutor<>(getLanguage(), getArithmetic(), getState(), Reason.EXECUTE_READ);
 	}
 
 	@Override
@@ -91,6 +84,11 @@ class TestThread implements PcodeThread<Void> {
 		machine.record.add("sp:" + name);
 	}
 
+	@Override
+	public void stepPatch(String sleigh) {
+		machine.record.add("x:" + name);
+	}
+
 	@Override
 	public void setCounter(Address counter) {
 	}
@@ -181,8 +179,4 @@ class TestThread implements PcodeThread<Void> {
 	@Override
 	public void clearAllInjects() {
 	}
-
-	@Override
-	public void stepPatch(String sleigh) {
-	}
 }