diff --git a/test/dorkboxTest/network/rmi/RmiSimpleTest.kt b/test/dorkboxTest/network/rmi/RmiSimpleTest.kt
index 7e5227bb..1e7bf178 100644
--- a/test/dorkboxTest/network/rmi/RmiSimpleTest.kt
+++ b/test/dorkboxTest/network/rmi/RmiSimpleTest.kt
@@ -68,7 +68,7 @@ class RmiSimpleTest : BaseTest() {
     }
 
     @Test
-    fun rmiIPcNetworkConnection() {
+    fun rmiIpcNetworkConnection() {
         rmi()
     }
 
@@ -76,7 +76,10 @@ class RmiSimpleTest : BaseTest() {
         run {
             val configuration = serverConfig()
             config(configuration)
-            RmiCommonTest.register(configuration.serialization)
+            configuration.serialization.registerRmi(TestCow::class.java, TestCowImpl::class.java)
+            configuration.serialization.register(MessageWithTestCow::class.java)
+            configuration.serialization.register(UnsupportedOperationException::class.java)
+
 
             val server = Server<Connection>(configuration)
             addEndPoint(server)
@@ -91,6 +94,7 @@ class RmiSimpleTest : BaseTest() {
 
 
                 System.err.println("Starting test for: Server -> Client")
+                // NOTE: THIS IS BI-DIRECTIONAL!
                 connection.createObject<TestCow>(123) { rmiId, remoteObject ->
                     System.err.println("Running test for: Server -> Client")
                     RmiCommonTest.runTests(connection, remoteObject, 123)
@@ -102,6 +106,8 @@ class RmiSimpleTest : BaseTest() {
         run {
             val configuration = clientConfig()
             config(configuration)
+//            configuration.serialization.registerRmi(TestCow::class.java, TestCowImpl::class.java)
+
 
             val client = Client<Connection>(configuration)
             addEndPoint(client)
@@ -128,14 +134,16 @@ class RmiSimpleTest : BaseTest() {
             }
         }
 
-        waitForThreads(99999999)
+        waitForThreads()
     }
 
     fun rmiGlobal(config: (Configuration) -> Unit = {}) {
         run {
             val configuration = serverConfig()
             config(configuration)
-            RmiCommonTest.register(configuration.serialization)
+            configuration.serialization.registerRmi(TestCow::class.java, TestCowImpl::class.java)
+            configuration.serialization.register(MessageWithTestCow::class.java)
+            configuration.serialization.register(UnsupportedOperationException::class.java)
 
             // for Client -> Server RMI
             configuration.serialization.registerRmi(TestCow::class.java, TestCowImpl::class.java)
@@ -166,6 +174,7 @@ class RmiSimpleTest : BaseTest() {
         run {
             val configuration = clientConfig()
             config(configuration)
+//            configuration.serialization.registerRmi(TestCow::class.java, TestCowImpl::class.java)
 
             val client = Client<Connection>(configuration)
             addEndPoint(client)
diff --git a/test/dorkboxTest/network/rmi/multiJVM/TestServer.kt b/test/dorkboxTest/network/rmi/multiJVM/TestServer.kt
index 82891483..5df9b364 100644
--- a/test/dorkboxTest/network/rmi/multiJVM/TestServer.kt
+++ b/test/dorkboxTest/network/rmi/multiJVM/TestServer.kt
@@ -18,7 +18,6 @@ package dorkboxTest.network.rmi.multiJVM
 import dorkbox.network.Server
 import dorkbox.network.connection.Connection
 import dorkboxTest.network.BaseTest
-import dorkboxTest.network.rmi.RmiCommonTest
 import dorkboxTest.network.rmi.cows.MessageWithTestCow
 import dorkboxTest.network.rmi.cows.TestBabyCowImpl
 import dorkboxTest.network.rmi.cows.TestCow
@@ -36,7 +35,10 @@ object TestServer {
 
         val configuration = BaseTest.serverConfig()
 
-        RmiCommonTest.register(configuration.serialization)
+        configuration.serialization.registerRmi(TestCow::class.java, TestCowImpl::class.java)
+        configuration.serialization.register(MessageWithTestCow::class.java)
+        configuration.serialization.register(UnsupportedOperationException::class.java)
+
         configuration.serialization.register(TestBabyCowImpl::class.java)
         configuration.serialization.registerRmi(TestCow::class.java, TestCowImpl::class.java)
         configuration.enableRemoteSignatureValidation = false