diff --git a/basice2e/clients.goldoutput/client200.txt b/basice2e/clients.goldoutput/client200.txt
index a0961cee047fba68d139fd027114f7c87ed70e86..9a161c88506412ec87a343160b8c6c03c40348dd 100644
--- a/basice2e/clients.goldoutput/client200.txt
+++ b/basice2e/clients.goldoutput/client200.txt
@@ -1,4 +1,4 @@
+ConnectionServer heard message "Hello 200 from 201, using connections"
 Established connection server, begin listening...
 Established connection with client
-ConnectionServer heard message "Hello 200 from 201, using connections"
 Shutting down connection server
diff --git a/basice2e/clients.goldoutput/client201.txt b/basice2e/clients.goldoutput/client201.txt
index 91a6b1ca6f6ab22b4116969c4a0e9b8dde84475c..90452af1559d32da667d57f39ef15d4dede33908 100644
--- a/basice2e/clients.goldoutput/client201.txt
+++ b/basice2e/clients.goldoutput/client201.txt
@@ -1,5 +1,5 @@
+Disconnected from partner
+Established connection with server
 Loading ephemerally
 Sending connection request
-Established connection with server
 Sent message "Hello 200 from 201, using connections" to connection partner.
-Disconnected from partner
diff --git a/basice2e/clients.goldoutput/client202.txt b/basice2e/clients.goldoutput/client202.txt
index 9f7ecc3e28b84f56ef27f009957bd2a12faee3fa..333d3a7169400918791f1c9a3c74ca2e42548100 100644
--- a/basice2e/clients.goldoutput/client202.txt
+++ b/basice2e/clients.goldoutput/client202.txt
@@ -1,4 +1,4 @@
-Established connection server, begin listening...
-Established authenticated connection with client
 AuthServer heard message "Hello 202 from 203, using connections"
+Established 
+Established connection server, begin listening...
 Shutting down connection server
diff --git a/basice2e/clients.goldoutput/client203.txt b/basice2e/clients.goldoutput/client203.txt
index 1a64149708be88ab60abceef5e6f4e6c1903fcc6..72acfc77ddc0b087a08669d23008cd02fdc8f91b 100644
--- a/basice2e/clients.goldoutput/client203.txt
+++ b/basice2e/clients.goldoutput/client203.txt
@@ -1,5 +1,5 @@
+Disconnected from partner
+Established 
 Loading ephemerally
 Sending connection request
-Established authenticated connection with server.
 Sent message "Hello 202 from 203, using connections" to connection partner.
-Disconnected from partner
diff --git a/basice2e/clients.goldoutput/client204.txt b/basice2e/clients.goldoutput/client204.txt
index 9b31c61fd3b4fb95f033dccc201514c5ebcb53d1..471ba6835ad9ff13c0177acacf0b650a7919095d 100644
--- a/basice2e/clients.goldoutput/client204.txt
+++ b/basice2e/clients.goldoutput/client204.txt
@@ -1,4 +1,4 @@
+ConnectionServer heard message "Hello 204 from 205, using connections"
 Established connection server, begin listening...
 Established connection with client
-ConnectionServer heard message "Hello 204 from 205, using connections"
 Shutting down connection server
diff --git a/basice2e/clients.goldoutput/client205.txt b/basice2e/clients.goldoutput/client205.txt
index cd183e9af416d1ce2fb0fc83fed48d1112966647..117b899e00b1cbac9259fe8358cd7113ca7c722a 100644
--- a/basice2e/clients.goldoutput/client205.txt
+++ b/basice2e/clients.goldoutput/client205.txt
@@ -1,5 +1,5 @@
+Disconnected from partner
+Established connection with server
 Loading non-ephemerally
 Sending connection request
-Established connection with server
 Sent message "Hello 204 from 205, using connections" to connection partner.
-Disconnected from partner
\ No newline at end of file
diff --git a/basice2e/clients.goldoutput/client206.txt b/basice2e/clients.goldoutput/client206.txt
index 7e8a2e3cc873193f6ec4e9ed7642f35dee608e9f..caf7721774e36b60dd6eb605b6bf2ddaadcc2510 100644
--- a/basice2e/clients.goldoutput/client206.txt
+++ b/basice2e/clients.goldoutput/client206.txt
@@ -1,4 +1,4 @@
-Established connection server, begin listening...
-Established authenticated connection with client
 AuthServer heard message "Hello 206 from 207, using connections"
+Established 
+Established connection server, begin listening...
 Shutting down connection server
diff --git a/basice2e/clients.goldoutput/client207.txt b/basice2e/clients.goldoutput/client207.txt
index fdabfedc66a42aa737f51d81619730576f72fee6..c348e725439b55792671df0af2efc96baa890e5d 100644
--- a/basice2e/clients.goldoutput/client207.txt
+++ b/basice2e/clients.goldoutput/client207.txt
@@ -1,5 +1,5 @@
+Disconnected from partner
+Established 
 Loading non-ephemerally
 Sending connection request
-Established authenticated connection with server.
 Sent message "Hello 206 from 207, using connections" to connection partner.
-Disconnected from partner
diff --git a/basice2e/clients.goldoutput/client42.txt b/basice2e/clients.goldoutput/client42.txt
index a89cac52de3cae876d139928e1520d9a28d5edc1..b467a451c581c19d83a5e2516d5730d72e75bcb0 100644
--- a/basice2e/clients.goldoutput/client42.txt
+++ b/basice2e/clients.goldoutput/client42.txt
@@ -24,6 +24,7 @@ Message received: Hello from Rick42 to myself, without E2E Encryption
 Received 0
 Received 0
 Received 0
+Received 0
 Received 1
 Received 5
 Received 5
diff --git a/basice2e/clients.goldoutput/client43.txt b/basice2e/clients.goldoutput/client43.txt
index 418601325df3808fffb3a8f7b06fb66da8e1b08a..c6124be3d51873f48340f0378b14b134296ff6a0 100644
--- a/basice2e/clients.goldoutput/client43.txt
+++ b/basice2e/clients.goldoutput/client43.txt
@@ -1,3 +1,4 @@
+
 Adding 
 Message received: Hello from Rick42, with E2E Encryption
 Message received: Hello from Rick42, with E2E Encryption
diff --git a/basice2e/clients.goldoutput/client45.txt b/basice2e/clients.goldoutput/client45.txt
index d027c5421d929e381139142b8a695f530d8c27fd..3504841ad1af78a680fffa9d96b0b4245c13b1a5 100644
--- a/basice2e/clients.goldoutput/client45.txt
+++ b/basice2e/clients.goldoutput/client45.txt
@@ -1,3 +1,4 @@
+Adding 
 Message received: Hello, 4
 Message received: Hello, 4
 Message received: Hello, 4
@@ -80,3 +81,4 @@ Sent: Hello, 5
 Sent: Hello, 5
 Sent: Hello, 5
 Sent: Hello, 5
+WARNING: unsafe channel creation enabled