diff --git a/Ghidra/Debug/Debugger-agent-lldb/data/debugger-launchers/ssh-lldb-win.ps1 b/Ghidra/Debug/Debugger-agent-lldb/data/debugger-launchers/ssh-lldb-win.ps1
index 3fd12b7a1c..c5f53dc9c7 100644
--- a/Ghidra/Debug/Debugger-agent-lldb/data/debugger-launchers/ssh-lldb-win.ps1
+++ b/Ghidra/Debug/Debugger-agent-lldb/data/debugger-launchers/ssh-lldb-win.ps1
@@ -43,7 +43,7 @@
 
 $Env:OPT_OS_WINDOWS = $true
 $arglist = @("")
-$arglist += ("cat >  .\.lldbinit")
+$arglist += ("cat >  .\ghidra.lldbinit")
 $sshargs = Compute-Ssh-Args $arglist True
 
 $tgtargs = $Env:OPT_TARGET_ARGS
@@ -62,6 +62,7 @@ Replace('$OPT_EXTRA_CMDS', $Env:OPT_EXTRA_CMDS)`
  
 $arglist = @("")
 $arglist += ("$Env:OPT_LLDB_PATH")
+$arglist += ("-s", ".\ghidra.lldbinit")
 $arglist += ("$Env:OPT_LLDB_ARGS")
 $sshargs = Compute-Ssh-Args $arglist True
 
diff --git a/Ghidra/Debug/Debugger-agent-lldb/data/debugger-launchers/ssh-lldb-win.sh b/Ghidra/Debug/Debugger-agent-lldb/data/debugger-launchers/ssh-lldb-win.sh
index 20e783283a..4512ec16bb 100755
--- a/Ghidra/Debug/Debugger-agent-lldb/data/debugger-launchers/ssh-lldb-win.sh
+++ b/Ghidra/Debug/Debugger-agent-lldb/data/debugger-launchers/ssh-lldb-win.sh
@@ -62,7 +62,7 @@ function rewrite-lldbinit() {
 
 function launch-lldb-ssh-init() {
 	local -a sshargs
-	compute-ssh-args true "cat > .\.lldbinit"
+	compute-ssh-args true "cat > .\ghidra.lldbinit"
 
 	"${sshargs[@]}"
 }
@@ -71,7 +71,7 @@ rewrite-lldbinit | launch-lldb-ssh-init
 
 function launch-lldb-ssh() {
 	local -a sshargs
-	compute-ssh-args true "lldb"
+	compute-ssh-args true "lldb -s .\ghidra.lldbinit"
 
 	"${sshargs[@]}"
 }
diff --git a/Ghidra/Processors/PowerPC/build.gradle b/Ghidra/Processors/PowerPC/build.gradle
index 7e1c52b725..ee9c2f1910 100644
--- a/Ghidra/Processors/PowerPC/build.gradle
+++ b/Ghidra/Processors/PowerPC/build.gradle
@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * 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
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -26,5 +26,7 @@ eclipse.project.name = 'Processors PowerPC'
 dependencies {
 	api project(':Base')
 	api project(':BytePatterns')
+
+	testImplementation project(path: ':Emulation', configuration: 'testArtifacts')
 }
 
diff --git a/Ghidra/Processors/PowerPC/src/test.slow/java/ghidra/program/emulation/PpcPcodeUseropLibraryTest.java b/Ghidra/Processors/PowerPC/src/test/java/ghidra/program/emulation/PpcPcodeUseropLibraryTest.java
similarity index 100%
rename from Ghidra/Processors/PowerPC/src/test.slow/java/ghidra/program/emulation/PpcPcodeUseropLibraryTest.java
rename to Ghidra/Processors/PowerPC/src/test/java/ghidra/program/emulation/PpcPcodeUseropLibraryTest.java
diff --git a/Ghidra/Processors/tricore/build.gradle b/Ghidra/Processors/tricore/build.gradle
index 36988d3b0e..c9d0aa3f67 100644
--- a/Ghidra/Processors/tricore/build.gradle
+++ b/Ghidra/Processors/tricore/build.gradle
@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * 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
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -24,4 +24,6 @@ eclipse.project.name = 'Processors tricore'
 
 dependencies {
 	api project(':Base')
+
+	testImplementation project(path: ':Emulation', configuration: 'testArtifacts')
 }
diff --git a/Ghidra/Processors/tricore/src/test.slow/java/ghidra/program/emulation/TricorePcodeUseropLibraryTest.java b/Ghidra/Processors/tricore/src/test/java/ghidra/program/emulation/TricorePcodeUseropLibraryTest.java
similarity index 100%
rename from Ghidra/Processors/tricore/src/test.slow/java/ghidra/program/emulation/TricorePcodeUseropLibraryTest.java
rename to Ghidra/Processors/tricore/src/test/java/ghidra/program/emulation/TricorePcodeUseropLibraryTest.java