diff --git a/basice2e/clients.goldoutput/client18.out b/basice2e/clients.goldoutput/client18.out
deleted file mode 100644
index 6c5b3a123f85088fdaf06340aa55afd17f60bfca..0000000000000000000000000000000000000000
--- a/basice2e/clients.goldoutput/client18.out
+++ /dev/null
@@ -1,2 +0,0 @@
-Received: Hello, 18, with E2E Encryption
-Sending Message to 9, Spencer: Hello, 9, with E2E Encryption
diff --git a/basice2e/clients.goldoutput/client18.txt b/basice2e/clients.goldoutput/client18.txt
new file mode 100644
index 0000000000000000000000000000000000000000..7369a5d61664835324764282971d1f85acedc48f
--- /dev/null
+++ b/basice2e/clients.goldoutput/client18.txt
@@ -0,0 +1,2 @@
+Message from 1122492445..., +CrSKtshK1HhaYaw+S8ePLYeVru/E+z/bwVOpfn3noY= Received: Hello, 18, with E2E Encryption
+Sending Message to 9, Spencer: Hello, 9, with E2E Encryption
diff --git a/basice2e/clients.goldoutput/client45.out b/basice2e/clients.goldoutput/client45.txt
similarity index 100%
rename from basice2e/clients.goldoutput/client45.out
rename to basice2e/clients.goldoutput/client45.txt
diff --git a/basice2e/clients.goldoutput/client56.out b/basice2e/clients.goldoutput/client56.txt
similarity index 100%
rename from basice2e/clients.goldoutput/client56.out
rename to basice2e/clients.goldoutput/client56.txt
diff --git a/basice2e/clients.goldoutput/client67.out b/basice2e/clients.goldoutput/client67.txt
similarity index 100%
rename from basice2e/clients.goldoutput/client67.out
rename to basice2e/clients.goldoutput/client67.txt
diff --git a/basice2e/clients.goldoutput/client74.out b/basice2e/clients.goldoutput/client74.txt
similarity index 100%
rename from basice2e/clients.goldoutput/client74.out
rename to basice2e/clients.goldoutput/client74.txt
diff --git a/basice2e/clients.goldoutput/client9.out b/basice2e/clients.goldoutput/client9.out
deleted file mode 100644
index 3206400c8bc6f094e33060bce3f6095d260721b1..0000000000000000000000000000000000000000
--- a/basice2e/clients.goldoutput/client9.out
+++ /dev/null
@@ -1,2 +0,0 @@
-Received: Hello, 9, with E2E Encryption
-Sending Message to 18, Bernardo: Hello, 18, with E2E Encryption
diff --git a/basice2e/clients.goldoutput/client9.txt b/basice2e/clients.goldoutput/client9.txt
new file mode 100644
index 0000000000000000000000000000000000000000..7611f0c3b5284c1e5566f01833b8c51675ef7137
--- /dev/null
+++ b/basice2e/clients.goldoutput/client9.txt
@@ -0,0 +1,2 @@
+Message from 1370780053..., Hk5XFJO6EF5R98MW7/FTYaC5rHbJ3tRFYZkj4EKd3ro= Received: Hello, 9, with E2E Encryption
+Sending Message to 18, Bernardo: Hello, 18, with E2E Encryption
diff --git a/basice2e/run.sh b/basice2e/run.sh
index 37f2bc1ff5bc779d5b6d296c9f26a9c34bdc268a..442987f2c69dc6f6a044d3c509d305212b83258e 100755
--- a/basice2e/run.sh
+++ b/basice2e/run.sh
@@ -158,9 +158,9 @@ wait $PIDVAL || true
 # FIXME: Go into client and clean up it's output so this is not necessary
 for C in $(ls -1 $CLIENTOUT); do
     # Remove the [CLIENT] Lines and cut them down
-    cat $CLIENTOUT/$C | grep "[CLIENT]" | cut -d\  -f5- | grep -e "Received\:" -e "Sending Message" -e "Message from" > $CLIENTCLEAN/$C || true
+    cat $CLIENTOUT/$C | grep "\[CLIENT\]" | cut -d\  -f5- | grep -e "Received\:" -e "Sending Message" -e "Message from" > $CLIENTCLEAN/$C || true
     # Take the clean lines and add them
-    cat $CLIENTOUT/$C | grep -v "[CLIENT]" | grep -e "Received\:" -e "Sending Message" -e "Message from" >> $CLIENTCLEAN/$C || true
+    cat $CLIENTOUT/$C | grep -v "\[CLIENT\]" | grep -e "Received\:" -e "Sending Message" -e "Message from" >> $CLIENTCLEAN/$C || true
 done
 
 # only expect up to 10c messages from the e2e clients
diff --git a/basice2e/tmp b/basice2e/tmp
index 6925ac0c721990d248d73e0820952c893eaaba09..7611f0c3b5284c1e5566f01833b8c51675ef7137 100644
--- a/basice2e/tmp
+++ b/basice2e/tmp
@@ -1,10 +1,2 @@
-Received: Hello, 9, with E2E Encryption
-Received: Hello, 9, with E2E Encryption
-Received: Hello, 9, with E2E Encryption
-Received: Hello, 9, with E2E Encryption
-Received: Hello, 9, with E2E Encryption
-Sending Message to 18, Bernardo: Hello, 18, with E2E Encryption
-Sending Message to 18, Bernardo: Hello, 18, with E2E Encryption
-Sending Message to 18, Bernardo: Hello, 18, with E2E Encryption
-Sending Message to 18, Bernardo: Hello, 18, with E2E Encryption
+Message from 1370780053..., Hk5XFJO6EF5R98MW7/FTYaC5rHbJ3tRFYZkj4EKd3ro= Received: Hello, 9, with E2E Encryption
 Sending Message to 18, Bernardo: Hello, 18, with E2E Encryption