diff --git a/README.md b/README.md
index 6a39ca09..e742ea83 100644
--- a/README.md
+++ b/README.md
@@ -93,7 +93,7 @@ Maven Info
     <dependency>
       <groupId>com.dorkbox</groupId>
       <artifactId>Network</artifactId>
-      <version>5.2</version>
+      <version>5.3</version>
     </dependency>
 </dependencies>
 ```
@@ -103,7 +103,7 @@ Gradle Info
 ```
 dependencies {
     ...
-    implementation("com.dorkbox:Network:5.2")
+    implementation("com.dorkbox:Network:5.3")
 }
 ```
 
diff --git a/build.gradle.kts b/build.gradle.kts
index 0419d63f..94f26911 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -48,7 +48,7 @@ object Extras {
     // set for the project
     const val description = "Encrypted, high-performance, and event-driven/reactive network stack for Java 8+"
     const val group = "com.dorkbox"
-    const val version = "5.2"
+    const val version = "5.3"
 
     // set as project.ext
     const val name = "Network"
@@ -74,10 +74,8 @@ GradleUtils.compileConfiguration(JavaVersion.VERSION_1_8) {
 //GradleUtils.jpms(JavaVersion.VERSION_1_9)
 
 
-// TODO: ping! (still WIP)
-
 // ratelimiter, "other" package
-// ping, rest of unit tests
+// rest of unit tests
 // getConnectionUpgradeType
 // ability to send with a function callback (using RMI waiter type stuff for callbacks)
 // use conscrypt?!
diff --git a/test/dorkboxTest/network/ListenerTest.kt b/test/dorkboxTest/network/ListenerTest.kt
index 9ac0eda9..d81829fa 100644
--- a/test/dorkboxTest/network/ListenerTest.kt
+++ b/test/dorkboxTest/network/ListenerTest.kt
@@ -72,11 +72,8 @@ class ListenerTest : BaseTest() {
     @Test
     @Throws(SecurityException::class, InitializationException::class, IOException::class, InterruptedException::class)
     fun listener() {
-        val server: Server<TestConnectionA> = object : Server<TestConnectionA>(
-                serverConfig()) {
-            override fun newConnection(connectionParameters: ConnectionParams<TestConnectionA>): TestConnectionA {
-                return TestConnectionA(connectionParameters)
-            }
+        val server: Server<TestConnectionA> = Server(serverConfig()) {
+            TestConnectionA(it)
         }
         addEndPoint(server)
 
@@ -117,11 +114,8 @@ class ListenerTest : BaseTest() {
 
 
         // ----
-        val client: Client<TestConnectionA> = object : Client<TestConnectionA>(
-                clientConfig()) {
-            override fun newConnection(connectionParameters: ConnectionParams<TestConnectionA>): TestConnectionA {
-                return TestConnectionA(connectionParameters)
-            }
+        val client: Client<TestConnectionA> = Client(clientConfig()) {
+            TestConnectionA(it)
         }
         addEndPoint(client)
 
diff --git a/test/dorkboxTest/network/PingPongTest.kt b/test/dorkboxTest/network/PingPongTest.kt
index 0e2e37ec..dc06233c 100644
--- a/test/dorkboxTest/network/PingPongTest.kt
+++ b/test/dorkboxTest/network/PingPongTest.kt
@@ -120,7 +120,7 @@ class PingPongTest : BaseTest() {
         }
     }
 
-    private fun register(manager: Serialization<Connection>) {
+    private fun register(manager: Serialization<*>) {
         manager.register(Data::class.java)
     }
 
diff --git a/test/dorkboxTest/network/SerializationValidationTest.kt b/test/dorkboxTest/network/SerializationValidationTest.kt
index 75b188cf..043e544c 100644
--- a/test/dorkboxTest/network/SerializationValidationTest.kt
+++ b/test/dorkboxTest/network/SerializationValidationTest.kt
@@ -58,7 +58,7 @@ class SerializationValidationTest : BaseTest() {
 
     @Test
     fun checkTakeKryo() {
-        val serialization = serverConfig().serialization
+        val serialization = serverConfig().serialization as Serialization<Connection>
 
         val kryos = mutableListOf<KryoExtra<Connection>>()
         for (i in 0 until 17) {
@@ -163,7 +163,7 @@ class SerializationValidationTest : BaseTest() {
         waitForThreads()
     }
 
-    private fun register(serialization: Serialization<Connection>) {
+    private fun register(serialization: Serialization<*>) {
         serialization.register(Command1::class.java)
         serialization.register(Command2::class.java)
         serialization.register(Command3::class.java)
diff --git a/test/dorkboxTest/network/memoryTest/MemoryTest.kt b/test/dorkboxTest/network/memoryTest/MemoryTest.kt
index 6264186b..7080ab7b 100644
--- a/test/dorkboxTest/network/memoryTest/MemoryTest.kt
+++ b/test/dorkboxTest/network/memoryTest/MemoryTest.kt
@@ -21,6 +21,7 @@ import dorkbox.network.Server
 import dorkbox.network.connection.Connection
 import dorkbox.network.rmi.RemoteObject
 import dorkbox.network.serialization.KryoExtra
+import dorkbox.network.serialization.Serialization
 import dorkboxTest.network.BaseTest
 import kotlinx.coroutines.runBlocking
 import org.junit.Ignore
@@ -154,7 +155,7 @@ class MemoryTest : BaseTest() {
 
     @Test
     fun runForeverTestKryoPool() {
-        val serialization = serverConfig().serialization
+        val serialization = serverConfig().serialization as Serialization<Connection>
 
         // 17 to force a pool size change
         var kryo1: KryoExtra<Connection>
diff --git a/test/dorkboxTest/network/rmi/RmiDelayedInvocationTest.kt b/test/dorkboxTest/network/rmi/RmiDelayedInvocationTest.kt
index 504d6b08..cf055ad9 100644
--- a/test/dorkboxTest/network/rmi/RmiDelayedInvocationTest.kt
+++ b/test/dorkboxTest/network/rmi/RmiDelayedInvocationTest.kt
@@ -41,7 +41,7 @@ class RmiDelayedInvocationTest : BaseTest() {
         }
     }
 
-    fun register(serialization: Serialization<Connection>) {
+    fun register(serialization: Serialization<*>) {
         serialization.rmi.register(TestObject::class.java, TestObjectImpl::class.java)
     }