diff --git a/test/dorkboxTest/network/rmi/RmiCommonTest.kt b/test/dorkboxTest/network/rmi/RmiCommonTest.kt
index 65372c04..278750b6 100644
--- a/test/dorkboxTest/network/rmi/RmiCommonTest.kt
+++ b/test/dorkboxTest/network/rmi/RmiCommonTest.kt
@@ -37,8 +37,8 @@ package dorkboxTest.network.rmi
 import dorkbox.network.connection.Connection
 import dorkbox.network.rmi.RemoteObject
 import dorkbox.network.serialization.Serialization
-import dorkboxTest.network.rmi.classes.MessageWithTestCow
-import dorkboxTest.network.rmi.classes.TestCow
+import dorkboxTest.network.rmi.cows.MessageWithTestCow
+import dorkboxTest.network.rmi.cows.TestCow
 import org.junit.Assert
 
 object RmiCommonTest {
diff --git a/test/dorkboxTest/network/rmi/RmiOverrideAndProxyTest.kt b/test/dorkboxTest/network/rmi/RmiOverrideAndProxyTest.kt
index 552f3e6f..b12a4186 100644
--- a/test/dorkboxTest/network/rmi/RmiOverrideAndProxyTest.kt
+++ b/test/dorkboxTest/network/rmi/RmiOverrideAndProxyTest.kt
@@ -119,8 +119,10 @@ class RmiOverrideAndProxyTest : BaseTest() {
             val client = Client<Connection>(configuration)
             addEndPoint(client)
 
+
             client.onConnect { connection ->
-                connection.createObject<TestObject>() { rmiId, remoteObject ->
+                connection.logger.error("Connected")
+                connection.createObject<TestObject> { rmiId, remoteObject ->
                     connection.logger.error("Starting test")
                     remoteObject.setValue(43.21f)
 
diff --git a/test/dorkboxTest/network/rmi/RmiSimpleTest.kt b/test/dorkboxTest/network/rmi/RmiSimpleTest.kt
index 46dd861e..db4e1cf6 100644
--- a/test/dorkboxTest/network/rmi/RmiSimpleTest.kt
+++ b/test/dorkboxTest/network/rmi/RmiSimpleTest.kt
@@ -39,9 +39,9 @@ import dorkbox.network.Configuration
 import dorkbox.network.Server
 import dorkbox.network.connection.Connection
 import dorkboxTest.network.BaseTest
-import dorkboxTest.network.rmi.classes.MessageWithTestCow
-import dorkboxTest.network.rmi.classes.TestCow
-import dorkboxTest.network.rmi.classes.TestCowImpl
+import dorkboxTest.network.rmi.cows.MessageWithTestCow
+import dorkboxTest.network.rmi.cows.TestCow
+import dorkboxTest.network.rmi.cows.TestCowImpl
 import kotlinx.coroutines.runBlocking
 import org.junit.Assert
 import org.junit.Test
diff --git a/test/dorkboxTest/network/rmi/classes/MessageWithTestCow.kt b/test/dorkboxTest/network/rmi/cows/MessageWithTestCow.kt
similarity index 94%
rename from test/dorkboxTest/network/rmi/classes/MessageWithTestCow.kt
rename to test/dorkboxTest/network/rmi/cows/MessageWithTestCow.kt
index 4501ce5b..85a8f1e7 100644
--- a/test/dorkboxTest/network/rmi/classes/MessageWithTestCow.kt
+++ b/test/dorkboxTest/network/rmi/cows/MessageWithTestCow.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package dorkboxTest.network.rmi.classes
+package dorkboxTest.network.rmi.cows
 
 class MessageWithTestCow(val testCow: TestCow) {
     var number = 0
diff --git a/test/dorkboxTest/network/rmi/classes/TestBabyCow.kt b/test/dorkboxTest/network/rmi/cows/TestBabyCow.kt
similarity index 94%
rename from test/dorkboxTest/network/rmi/classes/TestBabyCow.kt
rename to test/dorkboxTest/network/rmi/cows/TestBabyCow.kt
index dc09a694..1f2e59e2 100644
--- a/test/dorkboxTest/network/rmi/classes/TestBabyCow.kt
+++ b/test/dorkboxTest/network/rmi/cows/TestBabyCow.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package dorkboxTest.network.rmi.classes
+package dorkboxTest.network.rmi.cows
 
 /**
  *
diff --git a/test/dorkboxTest/network/rmi/classes/TestBabyCowImpl.kt b/test/dorkboxTest/network/rmi/cows/TestBabyCowImpl.kt
similarity index 95%
rename from test/dorkboxTest/network/rmi/classes/TestBabyCowImpl.kt
rename to test/dorkboxTest/network/rmi/cows/TestBabyCowImpl.kt
index dc4d4d2d..4c412d36 100644
--- a/test/dorkboxTest/network/rmi/classes/TestBabyCowImpl.kt
+++ b/test/dorkboxTest/network/rmi/cows/TestBabyCowImpl.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package dorkboxTest.network.rmi.classes
+package dorkboxTest.network.rmi.cows
 
 class TestBabyCowImpl(id: Int) : TestCowImpl(id), TestBabyCow {
     override fun drink() {
diff --git a/test/dorkboxTest/network/rmi/classes/TestCow.kt b/test/dorkboxTest/network/rmi/cows/TestCow.kt
similarity index 95%
rename from test/dorkboxTest/network/rmi/classes/TestCow.kt
rename to test/dorkboxTest/network/rmi/cows/TestCow.kt
index 5fabca1f..5e491a43 100644
--- a/test/dorkboxTest/network/rmi/classes/TestCow.kt
+++ b/test/dorkboxTest/network/rmi/cows/TestCow.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package dorkboxTest.network.rmi.classes
+package dorkboxTest.network.rmi.cows
 
 /**
  *
diff --git a/test/dorkboxTest/network/rmi/classes/TestCowBase.kt b/test/dorkboxTest/network/rmi/cows/TestCowBase.kt
similarity index 95%
rename from test/dorkboxTest/network/rmi/classes/TestCowBase.kt
rename to test/dorkboxTest/network/rmi/cows/TestCowBase.kt
index 5cab4590..18b65ab9 100644
--- a/test/dorkboxTest/network/rmi/classes/TestCowBase.kt
+++ b/test/dorkboxTest/network/rmi/cows/TestCowBase.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package dorkboxTest.network.rmi.classes
+package dorkboxTest.network.rmi.cows
 
 /**
  * This is a different interface so we can also test CachedMethod operations
diff --git a/test/dorkboxTest/network/rmi/classes/TestCowBaseImpl.kt b/test/dorkboxTest/network/rmi/cows/TestCowBaseImpl.kt
similarity index 95%
rename from test/dorkboxTest/network/rmi/classes/TestCowBaseImpl.kt
rename to test/dorkboxTest/network/rmi/cows/TestCowBaseImpl.kt
index 1d0c418a..f4180746 100644
--- a/test/dorkboxTest/network/rmi/classes/TestCowBaseImpl.kt
+++ b/test/dorkboxTest/network/rmi/cows/TestCowBaseImpl.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package dorkboxTest.network.rmi.classes
+package dorkboxTest.network.rmi.cows
 
 open class TestCowBaseImpl : TestCowBase {
     override fun throwException() {
diff --git a/test/dorkboxTest/network/rmi/classes/TestCowImpl.kt b/test/dorkboxTest/network/rmi/cows/TestCowImpl.kt
similarity index 98%
rename from test/dorkboxTest/network/rmi/classes/TestCowImpl.kt
rename to test/dorkboxTest/network/rmi/cows/TestCowImpl.kt
index 06eee927..8d048c7e 100644
--- a/test/dorkboxTest/network/rmi/classes/TestCowImpl.kt
+++ b/test/dorkboxTest/network/rmi/cows/TestCowImpl.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package dorkboxTest.network.rmi.classes
+package dorkboxTest.network.rmi.cows
 
 import dorkbox.network.connection.Connection
 import kotlinx.coroutines.delay
diff --git a/test/dorkboxTest/network/rmi/multiJVM/TestClient.kt b/test/dorkboxTest/network/rmi/multiJVM/TestClient.kt
index 0f7681f8..7f2fbd0c 100644
--- a/test/dorkboxTest/network/rmi/multiJVM/TestClient.kt
+++ b/test/dorkboxTest/network/rmi/multiJVM/TestClient.kt
@@ -26,9 +26,9 @@ import dorkbox.network.Client
 import dorkbox.network.connection.Connection
 import dorkboxTest.network.BaseTest
 import dorkboxTest.network.rmi.RmiCommonTest
-import dorkboxTest.network.rmi.classes.TestBabyCow
-import dorkboxTest.network.rmi.classes.TestBabyCowImpl
-import dorkboxTest.network.rmi.classes.TestCow
+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
 import org.slf4j.LoggerFactory
diff --git a/test/dorkboxTest/network/rmi/multiJVM/TestServer.kt b/test/dorkboxTest/network/rmi/multiJVM/TestServer.kt
index a9286fd7..1f1c52df 100644
--- a/test/dorkboxTest/network/rmi/multiJVM/TestServer.kt
+++ b/test/dorkboxTest/network/rmi/multiJVM/TestServer.kt
@@ -19,10 +19,10 @@ import dorkbox.network.Server
 import dorkbox.network.connection.Connection
 import dorkboxTest.network.BaseTest
 import dorkboxTest.network.rmi.RmiCommonTest
-import dorkboxTest.network.rmi.classes.MessageWithTestCow
-import dorkboxTest.network.rmi.classes.TestBabyCow
-import dorkboxTest.network.rmi.classes.TestCow
-import dorkboxTest.network.rmi.classes.TestCowImpl
+import dorkboxTest.network.rmi.cows.MessageWithTestCow
+import dorkboxTest.network.rmi.cows.TestBabyCow
+import dorkboxTest.network.rmi.cows.TestCow
+import dorkboxTest.network.rmi.cows.TestCowImpl
 import dorkboxTest.network.rmi.multiJVM.TestClient.setup
 import kotlinx.coroutines.runBlocking
 import org.junit.Assert