diff --git a/basice2e/clients.goldoutput/client200.txt b/basice2e/clients.goldoutput/client200.txt
index 4e7afe2c391a9614e0add97d893e5f27572d420a..832c11da1630aacc2aa81275562d5695160e6a53 100644
--- a/basice2e/clients.goldoutput/client200.txt
+++ b/basice2e/clients.goldoutput/client200.txt
@@ -1,3 +1,3 @@
 Established connection server, begin listening...
-Established connection with partner
-Received message: Hello 200 from 201, using connections
+Established connection with client
+ConnectionServer heard message "Hello 200 from 201, using connections"
diff --git a/basice2e/clients.goldoutput/client201.txt b/basice2e/clients.goldoutput/client201.txt
index fc153c63374c438c4f212cb6c956f8f73d1bbfe8..6323b37aea8bba96f7595432dfda0e51c37d1ff9 100644
--- a/basice2e/clients.goldoutput/client201.txt
+++ b/basice2e/clients.goldoutput/client201.txt
@@ -1,7 +1,6 @@
 Sending connection request
-Established connection with partner
+Established connection with server
 Sent message "Hello 200 from 201, using connections" to connection partner.
 Sending connection request
-Established connection with partner
-Disconnecting from connection partner
-Disconnected from partner
\ No newline at end of file
+Established connection with server
+Disconnected from partner
diff --git a/basice2e/clients.goldoutput/client202.txt b/basice2e/clients.goldoutput/client202.txt
index e087fec1a17567ed941557ad01eeb77d34ef7dd5..6b73f59e8cebed3a305b2bb8ba8bd2fa7fa84c39 100644
--- a/basice2e/clients.goldoutput/client202.txt
+++ b/basice2e/clients.goldoutput/client202.txt
@@ -1,6 +1,5 @@
-Established connection server, begin listening for authentication...
-Authenticated connection established
-Received authenticated connection from client
-Established connection with partner awaiting authentication...
-Received message: Hello 202 from 203, using connections
-Shutting down connection server
+Established connection server, begin listening...
+Established authenticated connection with client
+AuthServer heard message "Hello 202 from 203, using connections"
+Established authenticated connection with client
+
diff --git a/basice2e/clients.goldoutput/client203.txt b/basice2e/clients.goldoutput/client203.txt
index b7294de16caea1d347159588d745a73622d8a3dc..3d4833990a4d89358ab09b7727934199b18e89b6 100644
--- a/basice2e/clients.goldoutput/client203.txt
+++ b/basice2e/clients.goldoutput/client203.txt
@@ -1,7 +1,6 @@
 Sending connection request
-Established connection with partner.
+Established authenticated connection with server.
 Sent message "Hello 202 from 203, using connections" to connection partner.
 Sending connection request
-Established connection with partner.
-Disconnecting from connection partner
+Established authenticated connection with server.
 Disconnected from partner