diff --git a/src/dorkbox/network/Client.kt b/src/dorkbox/network/Client.kt
index a8ab5051..4f4e396f 100644
--- a/src/dorkbox/network/Client.kt
+++ b/src/dorkbox/network/Client.kt
@@ -429,7 +429,7 @@ open class Client<CONNECTION : Connection>(config: Configuration = Configuration
             }
 
             logger.info("Adding new signature for ${IP.toString(remoteAddress)} : ${Sys.bytesToHex(connectionInfo.publicKey)}")
-            settingsStore.addRegisteredServerKey(remoteAddress, connectionInfo.publicKey)
+            storage.addRegisteredServerKey(remoteAddress, connectionInfo.publicKey)
         }
 
 
diff --git a/test/dorkboxTest/network/BaseTest.kt b/test/dorkboxTest/network/BaseTest.kt
index b5422540..dfc1ee56 100644
--- a/test/dorkboxTest/network/BaseTest.kt
+++ b/test/dorkboxTest/network/BaseTest.kt
@@ -71,7 +71,7 @@ abstract class BaseTest {
 
     companion object {
         const val LOOPBACK = "loopback"
-        fun clientConfig(): Configuration {
+        fun clientConfig(block: Configuration.() -> Unit = {}): Configuration {
             val configuration = Configuration()
             configuration.settingsStore = MemoryStore.type() // don't want to persist anything on disk!
             configuration.subscriptionPort = 2000
@@ -80,7 +80,7 @@ abstract class BaseTest {
             return configuration
         }
 
-        fun serverConfig(): ServerConfiguration {
+        fun serverConfig(block: ServerConfiguration.() -> Unit = {}): ServerConfiguration {
             val configuration = ServerConfiguration()
             configuration.settingsStore = MemoryStore.type() // don't want to persist anything on disk!