Merge remote-tracking branch 'origin/GP-4801_Dan_deprecateModelDbgConnectors--SQUASHED'

Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/dbgeng/DbgEngTest.java

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,7 +16,7 @@
 package agent.dbgeng.dbgeng;
 
 import static org.junit.Assert.*;
-import static org.junit.Assume.*;
+import static org.junit.Assume.assumeTrue;
 
 import java.io.*;
 import java.nio.ByteBuffer;
@@ -45,6 +45,7 @@ import ghidra.test.AbstractGhidraHeadlessIntegrationTest;
 import ghidra.util.Msg;
 import ghidra.util.NumericUtilities;
 
+@Ignore("deprecated")
 public class DbgEngTest extends AbstractGhidraHeadlessIntegrationTest {
 
 	private interface DummyLibIf extends StdCallLibrary {

Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/manager/impl/SpawnedDbgManagerTest.java

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,8 +17,11 @@ package agent.dbgeng.manager.impl;
 
 import java.util.concurrent.CompletableFuture;
 
+import org.junit.Ignore;
+
 import agent.dbgeng.manager.DbgManager;
 
+@Ignore("deprecated")
 public class SpawnedDbgManagerTest extends AbstractDbgManagerTest {
 	@Override
 	protected CompletableFuture<Void> startManager(DbgManager manager) {

Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/gadp/GadpModelForDbgengBreakpointsTest.java

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,10 +15,13 @@
  */
 package agent.dbgeng.model.gadp;
 
+import org.junit.Ignore;
+
 import agent.dbgeng.model.AbstractModelForDbgengBreakpointsTest;
 import ghidra.dbg.util.PathPattern;
 import ghidra.dbg.util.PathUtils;
 
+@Ignore("deprecated")
 public class GadpModelForDbgengBreakpointsTest extends AbstractModelForDbgengBreakpointsTest {
 
 	@Override

Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/gadp/GadpModelForDbgengFactoryTest.java

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,8 +15,11 @@
  */
 package agent.dbgeng.model.gadp;
 
+import org.junit.Ignore;
+
 import agent.dbgeng.model.AbstractModelForDbgengFactoryTest;
 
+@Ignore("deprecated")
 public class GadpModelForDbgengFactoryTest extends AbstractModelForDbgengFactoryTest {
 	@Override
 	public ModelHost modelHost() throws Throwable {

Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/gadp/GadpModelForDbgengFrameActivationTest.java

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,13 +15,17 @@
  */
 package agent.dbgeng.model.gadp;
 
+import org.junit.Ignore;
+
 import agent.dbgeng.model.AbstractModelForDbgengFrameActivationTest;
 import ghidra.dbg.util.PathPattern;
 import ghidra.dbg.util.PathUtils;
 
+@Ignore("deprecated")
 public class GadpModelForDbgengFrameActivationTest
 		extends AbstractModelForDbgengFrameActivationTest {
 
+	@Override
 	protected PathPattern getStackPattern() {
 		return new PathPattern(PathUtils.parse("Sessions[0].Processes[].Threads[].Stack[]"));
 	}

Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/gadp/GadpModelForDbgengInterpreterTest.java

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -20,6 +20,7 @@ import org.junit.Test;
 
 import agent.dbgeng.model.AbstractModelForDbgengInterpreterTest;
 
+@Ignore("deprecated")
 public class GadpModelForDbgengInterpreterTest extends AbstractModelForDbgengInterpreterTest {
 
 	// NB: testLaunchViaInterpreterShowInProcessContainer fails

Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/gadp/GadpModelForDbgengProcessActivationTest.java

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,13 +17,17 @@ package agent.dbgeng.model.gadp;
 
 import java.util.List;
 
+import org.junit.Ignore;
+
 import agent.dbgeng.model.AbstractModelForDbgengProcessActivationTest;
 import ghidra.dbg.util.PathPattern;
 import ghidra.dbg.util.PathUtils;
 
+@Ignore("deprecated")
 public class GadpModelForDbgengProcessActivationTest
 		extends AbstractModelForDbgengProcessActivationTest {
 
+	@Override
 	protected PathPattern getProcessPattern() {
 		return new PathPattern(PathUtils.parse("Sessions[0].Processes[]"));
 	}
@@ -38,6 +42,7 @@ public class GadpModelForDbgengProcessActivationTest
 		return PathUtils.parse("Sessions[0]");
 	}
 
+	@Override
 	public String getIdFromCapture(String line) {
 		return line.split("\\s+")[1];
 	}

Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/gadp/GadpModelForDbgengRootAttacherTest.java

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,8 +15,11 @@
  */
 package agent.dbgeng.model.gadp;
 
+import org.junit.Ignore;
+
 import agent.dbgeng.model.AbstractModelForDbgengRootAttacherTest;
 
+@Ignore("deprecated")
 public class GadpModelForDbgengRootAttacherTest extends AbstractModelForDbgengRootAttacherTest {
 
 	// NB: testListAttachable fails with OTE - [] not invalidated

Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/gadp/GadpModelForDbgengRootLauncherTest.java

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,8 +15,11 @@
  */
 package agent.dbgeng.model.gadp;
 
+import org.junit.Ignore;
+
 import agent.dbgeng.model.AbstractModelForDbgengRootLauncherTest;
 
+@Ignore("deprecated")
 public class GadpModelForDbgengRootLauncherTest extends AbstractModelForDbgengRootLauncherTest {
 	@Override
 	public ModelHost modelHost() throws Throwable {

Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/gadp/GadpModelForDbgengScenarioCloneExitTest.java

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,8 +15,11 @@
  */
 package agent.dbgeng.model.gadp;
 
+import org.junit.Ignore;
+
 import agent.dbgeng.model.AbstractModelForDbgengScenarioCloneExitTest;
 
+@Ignore("deprecated")
 public class GadpModelForDbgengScenarioCloneExitTest
 		extends AbstractModelForDbgengScenarioCloneExitTest {
 	@Override

Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/gadp/GadpModelForDbgengScenarioForkExitTest.java

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -20,9 +20,11 @@ import org.junit.Test;
 
 import agent.dbgeng.model.AbstractModelForDbgengScenarioForkExitTest;
 
+@Ignore("deprecated")
 public class GadpModelForDbgengScenarioForkExitTest
 		extends AbstractModelForDbgengScenarioForkExitTest {
 
+	@Override
 	@Ignore("Specimen is currently defunct")
 	@Test
 	public void testScenario() throws Throwable {

Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/gadp/GadpModelForDbgengScenarioMemoryTest.java

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,8 +15,11 @@
  */
 package agent.dbgeng.model.gadp;
 
+import org.junit.Ignore;
+
 import agent.dbgeng.model.AbstractModelForDbgengScenarioMemoryTest;
 
+@Ignore("deprecated")
 public class GadpModelForDbgengScenarioMemoryTest extends AbstractModelForDbgengScenarioMemoryTest {
 
 	// NB: Fails on validateCompletionThread

Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/gadp/GadpModelForDbgengScenarioStackTest.java

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,8 +15,11 @@
  */
 package agent.dbgeng.model.gadp;
 
+import org.junit.Ignore;
+
 import agent.dbgeng.model.AbstractModelForDbgengScenarioStackTest;
 
+@Ignore("deprecated")
 public class GadpModelForDbgengScenarioStackTest extends AbstractModelForDbgengScenarioStackTest {
 	@Override
 	public ModelHost modelHost() throws Throwable {

Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/gadp/GadpModelForDbgengScenarioX64RegistersTest.java

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,8 +15,11 @@
  */
 package agent.dbgeng.model.gadp;
 
+import org.junit.Ignore;
+
 import agent.dbgeng.model.AbstractModelForDbgengScenarioX64RegistersTest;
 
+@Ignore("deprecated")
 public class GadpModelForDbgengScenarioX64RegistersTest
 		extends AbstractModelForDbgengScenarioX64RegistersTest {
 	@Override

Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/gadp/GadpModelForDbgengSessionActivationTest.java

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -19,8 +19,9 @@ import org.junit.Ignore;
 
 import agent.dbgeng.model.AbstractModelForDbgengSessionActivationTest;
 
-@Ignore("Don't know how to make multiple sessions")
+@Ignore("Don't know how to make multiple sessions, deprecated")
-public class GadpModelForDbgengSessionActivationTest extends AbstractModelForDbgengSessionActivationTest {
+public class GadpModelForDbgengSessionActivationTest
+		extends AbstractModelForDbgengSessionActivationTest {
 	@Override
 	public ModelHost modelHost() throws Throwable {
 		return new GadpDbgengModelHost();

Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/gadp/GadpModelForDbgengSteppableTest.java

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,8 +15,11 @@
  */
 package agent.dbgeng.model.gadp;
 
+import org.junit.Ignore;
+
 import agent.dbgeng.model.AbstractModelForDbgengSteppableTest;
 
+@Ignore("deprecated")
 public class GadpModelForDbgengSteppableTest extends AbstractModelForDbgengSteppableTest {
 	@Override
 	public ModelHost modelHost() throws Throwable {

Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/gadp/GadpModelForDbgengThreadActivationTest.java

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,13 +17,17 @@ package agent.dbgeng.model.gadp;
 
 import java.util.List;
 
+import org.junit.Ignore;
+
 import agent.dbgeng.model.AbstractModelForDbgengThreadActivationTest;
 import ghidra.dbg.util.PathPattern;
 import ghidra.dbg.util.PathUtils;
 
+@Ignore("deprecated")
 public class GadpModelForDbgengThreadActivationTest
 		extends AbstractModelForDbgengThreadActivationTest {
 
+	@Override
 	protected PathPattern getThreadPattern() {
 		return new PathPattern(PathUtils.parse("Sessions[0].Processes[].Threads[]"));
 	}
@@ -38,6 +42,7 @@ public class GadpModelForDbgengThreadActivationTest
 		return PathUtils.parse("Sessions[0]");
 	}
 
+	@Override
 	public String getIdFromCapture(String line) {
 		return line.split("\\s+")[1];
 	}

Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/gadp/GadpModelForDbgengX64RegistersTest.java

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,8 +15,11 @@
  */
 package agent.dbgeng.model.gadp;
 
+import org.junit.Ignore;
+
 import agent.dbgeng.model.AbstractModelForDbgengX64RegistersTest;
 
+@Ignore("deprecated")
 public class GadpModelForDbgengX64RegistersTest extends AbstractModelForDbgengX64RegistersTest {
 
 	// NB: Fails testWriteRegisters

Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmDbgengModelHost.java

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,11 +15,14 @@
  */
 package agent.dbgeng.model.invm;
 
+import org.junit.Ignore;
+
 import agent.dbgeng.DbgEngInJvmDebuggerModelFactory;
 import agent.dbgeng.dbgeng.DbgEngTest;
 import agent.dbgeng.model.AbstractDbgengModelHost;
 import ghidra.dbg.DebuggerModelFactory;
 
+@Ignore("deprecated")
 public class InVmDbgengModelHost extends AbstractDbgengModelHost {
 	@Override
 	public DebuggerModelFactory getModelFactory() {

Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmModelForDbgengBreakpointsTest.java

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,10 +15,15 @@
  */
 package agent.dbgeng.model.invm;
 
+import org.junit.Ignore;
+
+import org.junit.Ignore;
+
 import agent.dbgeng.model.AbstractModelForDbgengBreakpointsTest;
 import ghidra.dbg.util.PathPattern;
 import ghidra.dbg.util.PathUtils;
 
+@Ignore("deprecated")
 public class InVmModelForDbgengBreakpointsTest extends AbstractModelForDbgengBreakpointsTest {
 
 	@Override

Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmModelForDbgengFactoryTest.java

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,8 +15,11 @@
  */
 package agent.dbgeng.model.invm;
 
+import org.junit.Ignore;
+
 import agent.dbgeng.model.AbstractModelForDbgengFactoryTest;
 
+@Ignore("deprecated")
 public class InVmModelForDbgengFactoryTest extends AbstractModelForDbgengFactoryTest {
 	@Override
 	public ModelHost modelHost() throws Throwable {

Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmModelForDbgengFrameActivationTest.java

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,13 +15,17 @@
  */
 package agent.dbgeng.model.invm;
 
+import org.junit.Ignore;
+
 import agent.dbgeng.model.AbstractModelForDbgengFrameActivationTest;
 import ghidra.dbg.util.PathPattern;
 import ghidra.dbg.util.PathUtils;
 
+@Ignore("deprecated")
 public class InVmModelForDbgengFrameActivationTest
 		extends AbstractModelForDbgengFrameActivationTest {
 
+	@Override
 	protected PathPattern getStackPattern() {
 		return new PathPattern(PathUtils.parse("Sessions[0].Processes[].Threads[].Stack[]"));
 	}

Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmModelForDbgengInterpreterTest.java

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -21,6 +21,7 @@ import org.junit.Test;
 import agent.dbgeng.model.AbstractModelForDbgengInterpreterTest;
 import ghidra.dbg.error.DebuggerModelTerminatingException;
 
+@Ignore("deprecated")
 public class InVmModelForDbgengInterpreterTest extends AbstractModelForDbgengInterpreterTest {
 	@Override
 	public ModelHost modelHost() throws Throwable {

Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmModelForDbgengProcessActivationTest.java

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,13 +17,17 @@ package agent.dbgeng.model.invm;
 
 import java.util.List;
 
+import org.junit.Ignore;
+
 import agent.dbgeng.model.AbstractModelForDbgengProcessActivationTest;
 import ghidra.dbg.util.PathPattern;
 import ghidra.dbg.util.PathUtils;
 
+@Ignore("deprecated")
 public class InVmModelForDbgengProcessActivationTest
 		extends AbstractModelForDbgengProcessActivationTest {
 
+	@Override
 	protected PathPattern getProcessPattern() {
 		return new PathPattern(PathUtils.parse("Sessions[0].Processes[]"));
 	}
@@ -38,6 +42,7 @@ public class InVmModelForDbgengProcessActivationTest
 		return PathUtils.parse("Sessions[0]");
 	}
 
+	@Override
 	public String getIdFromCapture(String line) {
 		return line.split("\\s+")[1];
 	}

Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmModelForDbgengRootAttacherTest.java

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -20,6 +20,7 @@ import org.junit.Test;
 
 import agent.dbgeng.model.AbstractModelForDbgengRootAttacherTest;
 
+@Ignore("deprecated")
 public class InVmModelForDbgengRootAttacherTest extends AbstractModelForDbgengRootAttacherTest {
 	@Override
 	public ModelHost modelHost() throws Throwable {

Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmModelForDbgengRootLauncherTest.java

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,8 +15,11 @@
  */
 package agent.dbgeng.model.invm;
 
+import org.junit.Ignore;
+
 import agent.dbgeng.model.AbstractModelForDbgengRootLauncherTest;
 
+@Ignore("deprecated")
 public class InVmModelForDbgengRootLauncherTest extends AbstractModelForDbgengRootLauncherTest {
 	@Override
 	public ModelHost modelHost() throws Throwable {

Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmModelForDbgengScenarioCloneExitTest.java

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,8 +15,11 @@
  */
 package agent.dbgeng.model.invm;
 
+import org.junit.Ignore;
+
 import agent.dbgeng.model.AbstractModelForDbgengScenarioCloneExitTest;
 
+@Ignore("deprecated")
 public class InVmModelForDbgengScenarioCloneExitTest
 		extends AbstractModelForDbgengScenarioCloneExitTest {
 	@Override

Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmModelForDbgengScenarioForkExitTest.java

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -20,9 +20,11 @@ import org.junit.Test;
 
 import agent.dbgeng.model.AbstractModelForDbgengScenarioForkExitTest;
 
+@Ignore("deprecated")
 public class InVmModelForDbgengScenarioForkExitTest
 		extends AbstractModelForDbgengScenarioForkExitTest {
 
+	@Override
 	@Ignore("Specimen is currently defunct")
 	@Test
 	public void testScenario() throws Throwable {

Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmModelForDbgengScenarioMemoryTest.java

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,8 +15,11 @@
  */
 package agent.dbgeng.model.invm;
 
+import org.junit.Ignore;
+
 import agent.dbgeng.model.AbstractModelForDbgengScenarioMemoryTest;
 
+@Ignore("deprecated")
 public class InVmModelForDbgengScenarioMemoryTest extends AbstractModelForDbgengScenarioMemoryTest {
 	@Override
 	public ModelHost modelHost() throws Throwable {

Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmModelForDbgengScenarioStackTest.java

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,8 +15,11 @@
  */
 package agent.dbgeng.model.invm;
 
+import org.junit.Ignore;
+
 import agent.dbgeng.model.AbstractModelForDbgengScenarioStackTest;
 
+@Ignore("deprecated")
 public class InVmModelForDbgengScenarioStackTest extends AbstractModelForDbgengScenarioStackTest {
 	@Override
 	public ModelHost modelHost() throws Throwable {

Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmModelForDbgengScenarioX64RegistersTest.java

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,8 +15,11 @@
  */
 package agent.dbgeng.model.invm;
 
+import org.junit.Ignore;
+
 import agent.dbgeng.model.AbstractModelForDbgengScenarioX64RegistersTest;
 
+@Ignore("deprecated")
 public class InVmModelForDbgengScenarioX64RegistersTest
 		extends AbstractModelForDbgengScenarioX64RegistersTest {
 	@Override

Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmModelForDbgengSessionActivationTest.java

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -19,8 +19,9 @@ import org.junit.Ignore;
 
 import agent.dbgeng.model.AbstractModelForDbgengSessionActivationTest;
 
-@Ignore("Don't know how to make multiple sessions")
+@Ignore("Don't know how to make multiple sessions, deprecated")
-public class InVmModelForDbgengSessionActivationTest extends AbstractModelForDbgengSessionActivationTest {
+public class InVmModelForDbgengSessionActivationTest
+		extends AbstractModelForDbgengSessionActivationTest {
 	@Override
 	public ModelHost modelHost() throws Throwable {
 		return new InVmDbgengModelHost();

Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmModelForDbgengSteppableTest.java

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,8 +15,11 @@
  */
 package agent.dbgeng.model.invm;
 
+import org.junit.Ignore;
+
 import agent.dbgeng.model.AbstractModelForDbgengSteppableTest;
 
+@Ignore("deprecated")
 public class InVmModelForDbgengSteppableTest extends AbstractModelForDbgengSteppableTest {
 	@Override
 	public ModelHost modelHost() throws Throwable {

Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmModelForDbgengThreadActivationTest.java

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,13 +17,17 @@ package agent.dbgeng.model.invm;
 
 import java.util.List;
 
+import org.junit.Ignore;
+
 import agent.dbgeng.model.AbstractModelForDbgengThreadActivationTest;
 import ghidra.dbg.util.PathPattern;
 import ghidra.dbg.util.PathUtils;
 
+@Ignore("deprecated")
 public class InVmModelForDbgengThreadActivationTest
 		extends AbstractModelForDbgengThreadActivationTest {
 
+	@Override
 	protected PathPattern getThreadPattern() {
 		return new PathPattern(PathUtils.parse("Sessions[0].Processes[].Threads[]"));
 	}
@@ -38,6 +42,7 @@ public class InVmModelForDbgengThreadActivationTest
 		return PathUtils.parse("Sessions[0]");
 	}
 
+	@Override
 	public String getIdFromCapture(String line) {
 		return line.split("\\s+")[1];
 	}

Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmModelForDbgengX64RegistersTest.java

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,8 +15,11 @@
  */
 package agent.dbgeng.model.invm;
 
+import org.junit.Ignore;
+
 import agent.dbgeng.model.AbstractModelForDbgengX64RegistersTest;
 
+@Ignore("deprecated")
 public class InVmModelForDbgengX64RegistersTest extends AbstractModelForDbgengX64RegistersTest {
 
 	@Override

Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/dbgmodel/DbgModelSetContextMWETest.java

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -21,8 +21,7 @@ import static org.junit.Assert.assertNotNull;
 import java.io.*;
 import java.util.*;
 
-import org.junit.Before;
+import org.junit.*;
-import org.junit.Test;
 
 import agent.dbgeng.dbgeng.*;
 import agent.dbgeng.dbgeng.DebugBreakpoint.BreakFlags;
@@ -37,6 +36,7 @@ import ghidra.dbg.util.PathUtils;
 import ghidra.test.AbstractGhidraHeadlessIntegrationTest;
 import ghidra.util.Msg;
 
+@Ignore("deprecated")
 public class DbgModelSetContextMWETest extends AbstractGhidraHeadlessIntegrationTest {
 
 	@Before

Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/dbgmodel/DbgModelTest.java

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -22,8 +22,7 @@ import java.nio.ByteBuffer;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
 
-import org.junit.Before;
+import org.junit.*;
-import org.junit.Test;
 
 import com.sun.jna.Pointer;
 import com.sun.jna.WString;
@@ -53,6 +52,7 @@ import agent.dbgmodel.jna.dbgmodel.UnknownWithUtils;
 import ghidra.test.AbstractGhidraHeadlessIntegrationTest;
 import ghidra.util.NumericUtilities;
 
+@Ignore("deprecated")
 public class DbgModelTest extends AbstractGhidraHeadlessIntegrationTest {
 	protected static HostDataModelAccess cachedAccess = null;
 	protected static DebugClient cachedClient = null;

Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/model/invm/InVmModelForDbgmodelBreakpointsTest.java

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,10 +15,13 @@
  */
 package agent.dbgmodel.model.invm;
 
+import org.junit.Ignore;
+
 import agent.dbgeng.model.AbstractModelForDbgengBreakpointsTest;
 import ghidra.dbg.util.PathPattern;
 import ghidra.dbg.util.PathUtils;
 
+@Ignore("deprecated")
 public class InVmModelForDbgmodelBreakpointsTest extends AbstractModelForDbgengBreakpointsTest {
 
 	@Override

Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/model/invm/InVmModelForDbgmodelFactoryTest.java

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,9 +15,12 @@
  */
 package agent.dbgmodel.model.invm;
 
+import org.junit.Ignore;
+
 import agent.dbgeng.model.AbstractModelForDbgengFactoryTest;
 import ghidra.dbg.testutil.TestDebuggerModelProvider.ModelHost.WithoutThreadValidation;
 
+@Ignore("deprecated")
 public class InVmModelForDbgmodelFactoryTest extends AbstractModelForDbgengFactoryTest {
 
 	@Override

Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/model/invm/InVmModelForDbgmodelFrameActivationTest.java

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,13 +15,17 @@
  */
 package agent.dbgmodel.model.invm;
 
+import org.junit.Ignore;
+
 import agent.dbgeng.model.AbstractModelForDbgengFrameActivationTest;
 import ghidra.dbg.util.PathPattern;
 import ghidra.dbg.util.PathUtils;
 
+@Ignore("deprecated")
 public class InVmModelForDbgmodelFrameActivationTest
 		extends AbstractModelForDbgengFrameActivationTest {
 
+	@Override
 	protected PathPattern getStackPattern() {
 		return new PathPattern(
 			PathUtils.parse("Sessions[0x0].Processes[].Threads[].Stack.Frames[]"));

Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/model/invm/InVmModelForDbgmodelInterpreterTest.java

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -32,6 +32,7 @@ import ghidra.dbg.test.AbstractDebuggerModelTest;
 import ghidra.dbg.test.ProvidesTargetViaLaunchSpecimen;
 import ghidra.dbg.util.PathUtils;
 
+@Ignore("deprecated")
 public class InVmModelForDbgmodelInterpreterTest extends AbstractModelForDbgengInterpreterTest
 		implements ProvidesTargetViaLaunchSpecimen {
 	@Override

Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/model/invm/InVmModelForDbgmodelProcessActivationTest.java

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,15 +17,19 @@ package agent.dbgmodel.model.invm;
 
 import java.util.List;
 
+import org.junit.Ignore;
+
 import agent.dbgeng.model.AbstractModelForDbgengProcessActivationTest;
 import ghidra.dbg.target.TargetInterpreter;
 import ghidra.dbg.target.TargetObject;
 import ghidra.dbg.util.PathPattern;
 import ghidra.dbg.util.PathUtils;
 
+@Ignore("deprecated")
 public class InVmModelForDbgmodelProcessActivationTest
 		extends AbstractModelForDbgengProcessActivationTest {
 
+	@Override
 	protected PathPattern getProcessPattern() {
 		return new PathPattern(PathUtils.parse("Sessions[0x0].Processes[]"));
 	}
@@ -40,6 +44,7 @@ public class InVmModelForDbgmodelProcessActivationTest
 		return PathUtils.parse("Sessions[0x0]");
 	}
 
+	@Override
 	public String getIdFromCapture(String line) {
 		return "0x" + line.split("\\s+")[3];
 	}

Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/model/invm/InVmModelForDbgmodelRootAttacherTest.java

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -20,6 +20,7 @@ import org.junit.Test;
 
 import agent.dbgeng.model.AbstractModelForDbgengRootAttacherTest;
 
+@Ignore("deprecated")
 public class InVmModelForDbgmodelRootAttacherTest extends AbstractModelForDbgengRootAttacherTest {
 	@Override
 	public ModelHost modelHost() throws Throwable {

Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/model/invm/InVmModelForDbgmodelRootLauncherTest.java

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,8 +15,11 @@
  */
 package agent.dbgmodel.model.invm;
 
+import org.junit.Ignore;
+
 import agent.dbgeng.model.AbstractModelForDbgengRootLauncherTest;
 
+@Ignore("deprecated")
 public class InVmModelForDbgmodelRootLauncherTest extends AbstractModelForDbgengRootLauncherTest {
 	@Override
 	public ModelHost modelHost() throws Throwable {

Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/model/invm/InVmModelForDbgmodelScenarioCloneExitTest.java

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,8 +15,11 @@
  */
 package agent.dbgmodel.model.invm;
 
+import org.junit.Ignore;
+
 import agent.dbgeng.model.AbstractModelForDbgengScenarioCloneExitTest;
 
+@Ignore("deprecated")
 public class InVmModelForDbgmodelScenarioCloneExitTest
 		extends AbstractModelForDbgengScenarioCloneExitTest {
 	@Override

Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/model/invm/InVmModelForDbgmodelScenarioForkExitTest.java

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -20,9 +20,11 @@ import org.junit.Test;
 
 import agent.dbgeng.model.AbstractModelForDbgengScenarioForkExitTest;
 
+@Ignore("deprecated")
 public class InVmModelForDbgmodelScenarioForkExitTest
 		extends AbstractModelForDbgengScenarioForkExitTest {
 
+	@Override
 	@Ignore("Specimen is currently defunct")
 	@Test
 	public void testScenario() throws Throwable {

Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/model/invm/InVmModelForDbgmodelScenarioMemoryTest.java

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,6 +17,8 @@ package agent.dbgmodel.model.invm;
 
 import java.util.*;
 
+import org.junit.Ignore;
+
 import agent.dbgeng.model.AbstractModelForDbgengScenarioMemoryTest;
 import ghidra.dbg.target.TargetModule;
 import ghidra.dbg.target.TargetProcess;
@@ -24,6 +26,7 @@ import ghidra.dbg.util.PathUtils;
 import ghidra.program.model.address.Address;
 import ghidra.program.model.address.AddressRange;
 
+@Ignore("deprecated")
 public class InVmModelForDbgmodelScenarioMemoryTest
 		extends AbstractModelForDbgengScenarioMemoryTest {
 	@Override

Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/model/invm/InVmModelForDbgmodelScenarioStackTest.java

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,10 +15,13 @@
  */
 package agent.dbgmodel.model.invm;
 
+import org.junit.Ignore;
+
 import agent.dbgeng.model.AbstractModelForDbgengScenarioStackTest;
 import ghidra.dbg.target.TargetProcess;
 import ghidra.program.model.address.Address;
 
+@Ignore("deprecated")
 public class InVmModelForDbgmodelScenarioStackTest extends AbstractModelForDbgengScenarioStackTest {
 	@Override
 	public ModelHost modelHost() throws Throwable {

Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/model/invm/InVmModelForDbgmodelScenarioX64RegistersTest.java

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,8 +15,11 @@
  */
 package agent.dbgmodel.model.invm;
 
+import org.junit.Ignore;
+
 import agent.dbgeng.model.AbstractModelForDbgengScenarioX64RegistersTest;
 
+@Ignore("deprecated")
 public class InVmModelForDbgmodelScenarioX64RegistersTest
 		extends AbstractModelForDbgengScenarioX64RegistersTest {
 	@Override

Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/model/invm/InVmModelForDbgmodelSessionActivationTest.java

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -19,8 +19,9 @@ import org.junit.Ignore;
 
 import agent.dbgeng.model.AbstractModelForDbgengSessionActivationTest;
 
-@Ignore("Don't know how to make multiple sessions")
+@Ignore("Don't know how to make multiple sessions, deprecated")
-public class InVmModelForDbgmodelSessionActivationTest extends AbstractModelForDbgengSessionActivationTest {
+public class InVmModelForDbgmodelSessionActivationTest
+		extends AbstractModelForDbgengSessionActivationTest {
 	@Override
 	public ModelHost modelHost() throws Throwable {
 		return new InVmDbgmodelModelHost();