diff --git a/basice2e/clients.goldoutput/client1.txt b/basice2e/clients.goldoutput/client1.txt
index 47ccb074e80652dc310a9b46b147cc842868064f..b92af5f01e249bfd7cfd98a0778a5e09e76ad9ab 100644
--- a/basice2e/clients.goldoutput/client1.txt
+++ b/basice2e/clients.goldoutput/client1.txt
@@ -1,6 +1,6 @@
 Message received (Partner, Text): Hello from Ben Prime to Rick Prime via DM
+Message received (Partner, Text): What up from Rick Prime to Ben Prime via DM
 Message received (Self, Text): Hello from Rick Prime to myself via DM
 Message received (Self, Text): Hello from Rick Prime to myself via DM
-Message received (Self, Text): What up from Rick Prime to Ben Prime via DM
 Received 1/1 messages
 Received 3/3 messages
diff --git a/basice2e/clients.goldoutput/client121.txt b/basice2e/clients.goldoutput/client121.txt
index 6bc73cc044a0c4a90631c164228fcc0b66d48dfb..2de032e0d5dd4f96163fa91353b6cc793677fa38 100644
--- a/basice2e/clients.goldoutput/client121.txt
+++ b/basice2e/clients.goldoutput/client121.txt
@@ -1,7 +1,6 @@
 Adding 
 Backup update received.
 Backup update received.
-Backup update received.
 Message received: Hello from Client120, with E2E Encryption
 Message received: Hello from Client120, with E2E Encryption
 Message received: Hello from Client120, with E2E Encryption
diff --git a/basice2e/clients.goldoutput/client2.txt b/basice2e/clients.goldoutput/client2.txt
index ca07a75ccb53674489a92622e3efd1a1cc88844a..e0248d2bbe37d56dcb7582df5ae1a5be071be18d 100644
--- a/basice2e/clients.goldoutput/client2.txt
+++ b/basice2e/clients.goldoutput/client2.txt
@@ -1,3 +1,3 @@
-Message received (Partner, Text): What up from Rick Prime to Ben Prime via DM
+Message received (Partner, Text): Hello from Ben Prime to Rick Prime via DM
 Message received (Self, Text): Hello from Ben Prime to Rick Prime via DM
 Received 2/2 messages
diff --git a/basice2e/clients.goldoutput/client500.txt b/basice2e/clients.goldoutput/client500.txt
index a88c40546b0c66337630a0781efd85b884548f1d..2fe18384da10ab980c25ff654b2ea641e48a3ab3 100644
--- a/basice2e/clients.goldoutput/client500.txt
+++ b/basice2e/clients.goldoutput/client500.txt
@@ -1,5 +1,5 @@
 New channel generated
-Successfully joined channel ChannelName
 Received message (Hello, channel, this is 500) from ChannelName
 Sent message (Hello, channel, this is 500) to channel ChannelName
+Successfully joined channel ChannelName
 Successfully left channel ChannelName
diff --git a/basice2e/clients.goldoutput/client501.txt b/basice2e/clients.goldoutput/client501.txt
index be31c2308d11269208619cdc587e8ee0021d035d..1e7d858b3fda84e2eba04d4cf96c69711cea318c 100644
--- a/basice2e/clients.goldoutput/client501.txt
+++ b/basice2e/clients.goldoutput/client501.txt
@@ -1,5 +1,5 @@
-Successfully joined channel ChannelName
-Received message (Hello, channel, this is 501) from ChannelName
 Received message (Hello, channel, this is 500) from ChannelName
+Received message (Hello, channel, this is 501) from ChannelName
 Sent message (Hello, channel, this is 501) to channel ChannelName
+Successfully joined channel ChannelName
 Successfully left channel ChannelName
diff --git a/basice2e/clients.goldoutput/client502.txt b/basice2e/clients.goldoutput/client502.txt
index 621d31c7674f0ef6a6e25d5b524916c01f000942..b13dc2206f3a1e9d61045418b9dae91a00ae3e11 100644
--- a/basice2e/clients.goldoutput/client502.txt
+++ b/basice2e/clients.goldoutput/client502.txt
@@ -1,6 +1,6 @@
-Successfully joined channel ChannelName
-Received message (Hello, channel, this is 502) from ChannelName
-Received message (Hello, channel, this is 501) from ChannelName
 Received message (Hello, channel, this is 500) from ChannelName
+Received message (Hello, channel, this is 501) from ChannelName
+Received message (Hello, channel, this is 502) from ChannelName
 Sent message (Hello, channel, this is 502) to channel ChannelName
+Successfully joined channel ChannelName
 Successfully left channel ChannelName