diff --git a/test/dorkboxTest/network/BaseTest.kt b/test/dorkboxTest/network/BaseTest.kt
index 3095aa12..55d07754 100644
--- a/test/dorkboxTest/network/BaseTest.kt
+++ b/test/dorkboxTest/network/BaseTest.kt
@@ -81,12 +81,12 @@ abstract class BaseTest {
             jc.context = context
             context.reset() // override default configuration
 
-//        rootLogger.setLevel(Level.OFF);
+//        rootLogger.setLevel(Level.OFF)
 
-        rootLogger.level = Level.INFO;
-//        rootLogger.level = Level.TRACE;
+//        rootLogger.level = Level.INFO
+        rootLogger.level = Level.TRACE
 //            rootLogger.level = Level.DEBUG
-//        rootLogger.level = Level.ALL;
+//        rootLogger.level = Level.ALL
 
 
             // we only want error messages
diff --git a/test/dorkboxTest/network/PingPongTest.kt b/test/dorkboxTest/network/PingPongTest.kt
index e4d88cd5..60baaa80 100644
--- a/test/dorkboxTest/network/PingPongTest.kt
+++ b/test/dorkboxTest/network/PingPongTest.kt
@@ -38,11 +38,9 @@ import dorkbox.network.Client
 import dorkbox.network.Server
 import dorkbox.network.connection.Connection
 import dorkbox.network.serialization.Serialization
-import dorkbox.util.exceptions.SecurityException
 import kotlinx.coroutines.runBlocking
 import org.junit.Assert
 import org.junit.Test
-import java.io.IOException
 import java.util.concurrent.atomic.AtomicInteger
 
 class PingPongTest : BaseTest() {
@@ -51,7 +49,6 @@ class PingPongTest : BaseTest() {
     var tries = 1000
 
     @Test
-    @Throws(SecurityException::class, IOException::class)
     fun pingPong() {
         fail = "Data not received."
         val data = Data()
@@ -84,7 +81,6 @@ class PingPongTest : BaseTest() {
 
         run {
             val config = clientConfig()
-            register(config.serialization)
 
             val client: Client<Connection> = Client(config)
             addEndPoint(client)
diff --git a/test/dorkboxTest/network/SerializationValidationTest.kt b/test/dorkboxTest/network/SerializationValidationTest.kt
index 031b6743..f20754c6 100644
--- a/test/dorkboxTest/network/SerializationValidationTest.kt
+++ b/test/dorkboxTest/network/SerializationValidationTest.kt
@@ -42,7 +42,6 @@ class SerializationValidationTest : BaseTest() {
 
         run {
             val configuration = clientConfig()
-            register(configuration.serialization)
 
             val client = Client<Connection>(configuration)
             addEndPoint(client)
@@ -66,7 +65,7 @@ class SerializationValidationTest : BaseTest() {
         run {
             val configuration = serverConfig()
             configuration.serialization.registerRmi(TestObject::class.java, TestObjectImpl::class.java)
-            configuration.serialization.register(TestObject::class.java) // the iface is again, on purpose to verify registration order!
+            configuration.serialization.register(TestObjectImpl::class.java) // this is again, on purpose to verify registration order!
 
             val server = Server<Connection>(configuration)
             addEndPoint(server)
@@ -80,7 +79,6 @@ class SerializationValidationTest : BaseTest() {
 
         run {
             val configuration = clientConfig()
-            configuration.serialization.register(TestObject::class.java)
 
             val client = Client<Connection>(configuration)
             addEndPoint(client)
diff --git a/test/dorkboxTest/network/rmi/RmiCommonTest.kt b/test/dorkboxTest/network/rmi/RmiCommonTest.kt
index f82bee15..0d249dfb 100644
--- a/test/dorkboxTest/network/rmi/RmiCommonTest.kt
+++ b/test/dorkboxTest/network/rmi/RmiCommonTest.kt
@@ -39,6 +39,7 @@ import dorkbox.network.rmi.RemoteObject
 import dorkbox.network.serialization.Serialization
 import dorkboxTest.network.rmi.cows.MessageWithTestCow
 import dorkboxTest.network.rmi.cows.TestCow
+import dorkboxTest.network.rmi.cows.TestCowImpl
 import org.junit.Assert
 
 object RmiCommonTest {
@@ -141,10 +142,9 @@ object RmiCommonTest {
         connection.logger.error("Finished tests")
     }
 
-    fun register(manager: Serialization) {
-//        manager.register(Any::class.java) // Needed for Object#toString, hashCode, etc.
-        manager.register(TestCow::class.java)
-        manager.register(MessageWithTestCow::class.java)
-        manager.register(UnsupportedOperationException::class.java)
+    fun register(serialization: Serialization) {
+        serialization.registerRmi(TestCow::class.java, TestCowImpl::class.java)
+        serialization.register(MessageWithTestCow::class.java)
+        serialization.register(UnsupportedOperationException::class.java)
     }
 }
diff --git a/test/dorkboxTest/network/rmi/RmiDelayedInvocationSpamTest.kt b/test/dorkboxTest/network/rmi/RmiDelayedInvocationSpamTest.kt
index 96b0d52f..7d103e6d 100644
--- a/test/dorkboxTest/network/rmi/RmiDelayedInvocationSpamTest.kt
+++ b/test/dorkboxTest/network/rmi/RmiDelayedInvocationSpamTest.kt
@@ -15,16 +15,21 @@
  */
 package dorkboxTest.network.rmi
 
+import ch.qos.logback.classic.Level
+import ch.qos.logback.classic.Logger
+import ch.qos.logback.classic.joran.JoranConfigurator
 import dorkbox.network.Client
 import dorkbox.network.Configuration
 import dorkbox.network.Server
 import dorkbox.network.connection.Connection
 import dorkbox.network.rmi.RemoteObject
-import dorkbox.network.serialization.Serialization
 import dorkboxTest.network.BaseTest
 import kotlinx.coroutines.runBlocking
+import org.junit.After
 import org.junit.Assert
+import org.junit.Before
 import org.junit.Test
+import org.slf4j.LoggerFactory
 import java.util.concurrent.atomic.AtomicLong
 
 class RmiDelayedInvocationSpamTest : BaseTest() {
@@ -34,6 +39,32 @@ class RmiDelayedInvocationSpamTest : BaseTest() {
 
     var async = true
 
+    @Before
+    fun setupLogBefore() {
+        // assume SLF4J is bound to logback in the current environment
+        val rootLogger = LoggerFactory.getLogger(org.slf4j.Logger.ROOT_LOGGER_NAME) as Logger
+        val context = rootLogger.loggerContext
+        val jc = JoranConfigurator()
+        jc.context = context
+        context.reset() // override default configuration
+
+        // the logger cannot keep-up if it's on trace
+        rootLogger.level = Level.DEBUG
+    }
+
+    @After
+    fun setupLogAfter() {
+        // assume SLF4J is bound to logback in the current environment
+        val rootLogger = LoggerFactory.getLogger(org.slf4j.Logger.ROOT_LOGGER_NAME) as Logger
+        val context = rootLogger.loggerContext
+        val jc = JoranConfigurator()
+        jc.context = context
+        context.reset() // override default configuration
+
+        // the logger cannot keep-up if it's on trace
+        rootLogger.level = Level.TRACE
+    }
+
     @Test
     fun rmiNetwork() {
         runBlocking {
@@ -70,10 +101,6 @@ class RmiDelayedInvocationSpamTest : BaseTest() {
         }
     }
 
-    fun register(serialization: Serialization) {
-        serialization.registerRmi(TestObject::class.java, TestObjectImpl::class.java)
-    }
-
     /**
      * In this test the server has two objects in an object space. The client
      * uses the first remote object to get the second remote object.
@@ -87,7 +114,8 @@ class RmiDelayedInvocationSpamTest : BaseTest() {
         run {
             val configuration = serverConfig()
             config(configuration)
-            register(configuration.serialization)
+
+            configuration.serialization.registerRmi(TestObject::class.java, TestObjectImpl::class.java)
 
             server = Server(configuration)
             addEndPoint(server)
@@ -100,7 +128,6 @@ class RmiDelayedInvocationSpamTest : BaseTest() {
         run {
             val configuration = clientConfig()
             config(configuration)
-            register(configuration.serialization)
 
             val client = Client<Connection>(configuration)
             addEndPoint(client)
diff --git a/test/dorkboxTest/network/rmi/RmiDelayedInvocationTest.kt b/test/dorkboxTest/network/rmi/RmiDelayedInvocationTest.kt
index aad2aa3c..aa84705b 100644
--- a/test/dorkboxTest/network/rmi/RmiDelayedInvocationTest.kt
+++ b/test/dorkboxTest/network/rmi/RmiDelayedInvocationTest.kt
@@ -69,7 +69,6 @@ class RmiDelayedInvocationTest : BaseTest() {
         run {
             val configuration = clientConfig()
             config(configuration)
-            register(configuration.serialization)
 
             val client = Client<Connection>(configuration)
             addEndPoint(client)
diff --git a/test/dorkboxTest/network/rmi/RmiNestedTest.kt b/test/dorkboxTest/network/rmi/RmiNestedTest.kt
index 5dde38c9..47211e12 100644
--- a/test/dorkboxTest/network/rmi/RmiNestedTest.kt
+++ b/test/dorkboxTest/network/rmi/RmiNestedTest.kt
@@ -85,9 +85,6 @@ class RmiNestedTest : BaseTest() {
         run {
             val configuration = clientConfig()
 
-            configuration.serialization.registerRmi(TestObject::class.java, TestObjectAnnotImpl::class.java)
-            configuration.serialization.registerRmi(OtherObject::class.java, OtherObjectImpl::class.java)
-
             val client = Client<Connection>(configuration)
             addEndPoint(client)
 
@@ -154,8 +151,6 @@ class RmiNestedTest : BaseTest() {
 
         run {
             val configuration = clientConfig()
-            configuration.serialization.register(TestObject::class.java)
-            configuration.serialization.register(OtherObject::class.java)
 
             val client = Client<Connection>(configuration)
             addEndPoint(client)
@@ -223,8 +218,6 @@ class RmiNestedTest : BaseTest() {
 
         run {
             val configuration = clientConfig()
-            configuration.serialization.register(TestObject::class.java)
-            configuration.serialization.register(OtherObjectImpl::class.java)
 
             val client = Client<Connection>(configuration)
             addEndPoint(client)
diff --git a/test/dorkboxTest/network/rmi/RmiSimpleTest.kt b/test/dorkboxTest/network/rmi/RmiSimpleTest.kt
index 5d5b52bb..c5655b68 100644
--- a/test/dorkboxTest/network/rmi/RmiSimpleTest.kt
+++ b/test/dorkboxTest/network/rmi/RmiSimpleTest.kt
@@ -78,9 +78,6 @@ class RmiSimpleTest : BaseTest() {
             config(configuration)
             RmiCommonTest.register(configuration.serialization)
 
-            // for Client -> Server RMI
-            configuration.serialization.registerRmi(TestCow::class.java, TestCowImpl::class.java)
-
             val server = Server<Connection>(configuration)
             addEndPoint(server)
             server.bind()
@@ -105,10 +102,6 @@ class RmiSimpleTest : BaseTest() {
         run {
             val configuration = clientConfig()
             config(configuration)
-            RmiCommonTest.register(configuration.serialization)
-
-            // for Server -> Client RMI
-            configuration.serialization.registerRmi(TestCow::class.java, TestCowImpl::class.java)
 
             val client = Client<Connection>(configuration)
             addEndPoint(client)
@@ -173,10 +166,7 @@ class RmiSimpleTest : BaseTest() {
         run {
             val configuration = clientConfig()
             config(configuration)
-            RmiCommonTest.register(configuration.serialization)
 
-            // for Server -> Client RMI
-            configuration.serialization.registerRmi(TestCow::class.java, TestCowImpl::class.java)
             val client = Client<Connection>(configuration)
             addEndPoint(client)
 
diff --git a/test/dorkboxTest/network/rmi/multiJVM/TestClient.kt b/test/dorkboxTest/network/rmi/multiJVM/TestClient.kt
index 324122e1..3918bfb0 100644
--- a/test/dorkboxTest/network/rmi/multiJVM/TestClient.kt
+++ b/test/dorkboxTest/network/rmi/multiJVM/TestClient.kt
@@ -25,9 +25,6 @@ import ch.qos.logback.core.ConsoleAppender
 import dorkbox.network.Client
 import dorkbox.network.connection.Connection
 import dorkboxTest.network.BaseTest
-import dorkboxTest.network.rmi.RmiCommonTest
-import dorkboxTest.network.rmi.cows.TestBabyCow
-import dorkboxTest.network.rmi.cows.TestBabyCowImpl
 import dorkboxTest.network.rmi.cows.TestCow
 import kotlinx.coroutines.runBlocking
 import org.junit.Assert
@@ -68,9 +65,6 @@ object TestClient {
         setup()
 
         val configuration = BaseTest.clientConfig()
-        RmiCommonTest.register(configuration.serialization)
-        configuration.serialization.registerRmi(TestBabyCow::class.java, TestBabyCowImpl::class.java)
-        configuration.serialization.register(TestCow::class.java)
         configuration.enableRemoteSignatureValidation = false
 
         val client = Client<Connection>(configuration)
diff --git a/test/dorkboxTest/network/rmi/multiJVM/TestServer.kt b/test/dorkboxTest/network/rmi/multiJVM/TestServer.kt
index 9e08d518..82891483 100644
--- a/test/dorkboxTest/network/rmi/multiJVM/TestServer.kt
+++ b/test/dorkboxTest/network/rmi/multiJVM/TestServer.kt
@@ -20,7 +20,7 @@ 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.TestBabyCow
+import dorkboxTest.network.rmi.cows.TestBabyCowImpl
 import dorkboxTest.network.rmi.cows.TestCow
 import dorkboxTest.network.rmi.cows.TestCowImpl
 import dorkboxTest.network.rmi.multiJVM.TestClient.setup
@@ -37,7 +37,7 @@ object TestServer {
         val configuration = BaseTest.serverConfig()
 
         RmiCommonTest.register(configuration.serialization)
-        configuration.serialization.register(TestBabyCow::class.java)
+        configuration.serialization.register(TestBabyCowImpl::class.java)
         configuration.serialization.registerRmi(TestCow::class.java, TestCowImpl::class.java)
         configuration.enableRemoteSignatureValidation = false