diff --git a/basice2e/clients.goldoutput/client100.txt b/basice2e/clients.goldoutput/client100.txt
new file mode 100644
index 0000000000000000000000000000000000000000..8cc83e6875ac6545af5ff7dd6d8eb5db2286c0a3
--- /dev/null
+++ b/basice2e/clients.goldoutput/client100.txt
@@ -0,0 +1,43 @@
+
+Received 0
+Sent: Hello from Jake100, with E2E Encryption
+Sent: Hello from Jake100, with E2E Encryption
+Sent: Hello from Jake100, with E2E Encryption
+Sent: Hello from Jake100, with E2E Encryption
+Sent: Hello from Jake100, with E2E Encryption
+Sent: Hello from Jake100, with E2E Encryption
+Sent: Hello from Jake100, with E2E Encryption
+Sent: Hello from Jake100, with E2E Encryption
+Sent: Hello from Jake100, with E2E Encryption
+Sent: Hello from Jake100, with E2E Encryption
+Sent: Hello from Jake100, with E2E Encryption
+Sent: Hello from Jake100, with E2E Encryption
+Sent: Hello from Jake100, with E2E Encryption
+Sent: Hello from Jake100, with E2E Encryption
+Sent: Hello from Jake100, with E2E Encryption
+Sent: Hello from Jake100, with E2E Encryption
+Sent: Hello from Jake100, with E2E Encryption
+Sent: Hello from Jake100, with E2E Encryption
+Sent: Hello from Jake100, with E2E Encryption
+Sent: Hello from Jake100, with E2E Encryption
+Message received: Hello from Niamh101, with E2E Encryption
+Message received: Hello from Niamh101, with E2E Encryption
+Message received: Hello from Niamh101, with E2E Encryption
+Message received: Hello from Niamh101, with E2E Encryption
+Message received: Hello from Niamh101, with E2E Encryption
+Message received: Hello from Niamh101, with E2E Encryption
+Message received: Hello from Niamh101, with E2E Encryption
+Message received: Hello from Niamh101, with E2E Encryption
+Message received: Hello from Niamh101, with E2E Encryption
+Message received: Hello from Niamh101, with E2E Encryption
+Message received: Hello from Niamh101, with E2E Encryption
+Message received: Hello from Niamh101, with E2E Encryption
+Message received: Hello from Niamh101, with E2E Encryption
+Message received: Hello from Niamh101, with E2E Encryption
+Message received: Hello from Niamh101, with E2E Encryption
+Message received: Hello from Niamh101, with E2E Encryption
+Message received: Hello from Niamh101, with E2E Encryption
+Message received: Hello from Niamh101, with E2E Encryption
+Message received: Hello from Niamh101, with E2E Encryption
+Message received: Hello from Niamh101, with E2E Encryption
+Received 20
diff --git a/basice2e/clients.goldoutput/client101.txt b/basice2e/clients.goldoutput/client101.txt
new file mode 100644
index 0000000000000000000000000000000000000000..80d627a1434ff9e7e1c316b9968ca14c0f51d942
--- /dev/null
+++ b/basice2e/clients.goldoutput/client101.txt
@@ -0,0 +1,39 @@
+WARNING: unsafe channel creation enabled
+Adding 
+Received 0
+Sent: Hello from Niamh101, with E2E Encryption
+Sent: Hello from Niamh101, with E2E Encryption
+Sent: Hello from Niamh101, with E2E Encryption
+Sent: Hello from Niamh101, with E2E Encryption
+Sent: Hello from Niamh101, with E2E Encryption
+Sent: Hello from Niamh101, with E2E Encryption
+Sent: Hello from Niamh101, with E2E Encryption
+Sent: Hello from Niamh101, with E2E Encryption
+Sent: Hello from Niamh101, with E2E Encryption
+Sent: Hello from Niamh101, with E2E Encryption
+Sent: Hello from Niamh101, with E2E Encryption
+Sent: Hello from Niamh101, with E2E Encryption
+Sent: Hello from Niamh101, with E2E Encryption
+Sent: Hello from Niamh101, with E2E Encryption
+Sent: Hello from Niamh101, with E2E Encryption
+Sent: Hello from Niamh101, with E2E Encryption
+Sent: Hello from Niamh101, with E2E Encryption
+Sent: Hello from Niamh101, with E2E Encryption
+Sent: Hello from Niamh101, with E2E Encryption
+Sent: Hello from Niamh101, with E2E Encryption
+Message received: Hello from Jake100, with E2E Encryption
+Message received: Hello from Jake100, with E2E Encryption
+Message received: Hello from Jake100, with E2E Encryption
+Message received: Hello from Jake100, with E2E Encryption
+Message received: Hello from Jake100, with E2E Encryption
+Message received: Hello from Jake100, with E2E Encryption
+Message received: Hello from Jake100, with E2E Encryption
+Message received: Hello from Jake100, with E2E Encryption
+Message received: Hello from Jake100, with E2E Encryption
+Message received: Hello from Jake100, with E2E Encryption
+Message received: Hello from Jake100, with E2E Encryption
+Message received: Hello from Jake100, with E2E Encryption
+Message received: Hello from Jake100, with E2E Encryption
+Message received: Hello from Jake100, with E2E Encryption
+Message received: Hello from Jake100, with E2E Encryption
+Message received: Hello from Jake100, with E2E Encryption
diff --git a/basice2e/clients.goldoutput/client20.txt b/basice2e/clients.goldoutput/client20.txt
index 1dd491388ec96c6c23c226850b0dab0ba057bbc0..9576ea854f487e54b187ce4f5a327a797fc914d1 100644
--- a/basice2e/clients.goldoutput/client20.txt
+++ b/basice2e/clients.goldoutput/client20.txt
@@ -9,3 +9,14 @@ Message received: Hello from 21, without E2E Encryption
 Message received: Hello from 21, without E2E Encryption
 Message received: Hello from 21, without E2E Encryption
 Received 5
+Sent: Hello from 20, without E2E Encryption
+Sent: Hello from 20, without E2E Encryption
+Sent: Hello from 20, without E2E Encryption
+Sent: Hello from 20, without E2E Encryption
+Sent: Hello from 20, without E2E Encryption
+Message received: Hello from 21, without E2E Encryption
+Message received: Hello from 21, without E2E Encryption
+Message received: Hello from 21, without E2E Encryption
+Message received: Hello from 21, without E2E Encryption
+Message received: Hello from 21, without E2E Encryption
+Received 5
diff --git a/basice2e/clients.goldoutput/client21.txt b/basice2e/clients.goldoutput/client21.txt
index 8421479b26744bd705fc9e84f08be00fa23421e9..0ce63adb0c05c577975d35f62348f44419cb2379 100644
--- a/basice2e/clients.goldoutput/client21.txt
+++ b/basice2e/clients.goldoutput/client21.txt
@@ -9,3 +9,14 @@ Message received: Hello from 20, without E2E Encryption
 Message received: Hello from 20, without E2E Encryption
 Message received: Hello from 20, without E2E Encryption
 Received 5
+Sent: Hello from 21, without E2E Encryption
+Sent: Hello from 21, without E2E Encryption
+Sent: Hello from 21, without E2E Encryption
+Sent: Hello from 21, without E2E Encryption
+Sent: Hello from 21, without E2E Encryption
+Message received: Hello from 20, without E2E Encryption
+Message received: Hello from 20, without E2E Encryption
+Message received: Hello from 20, without E2E Encryption
+Message received: Hello from 20, without E2E Encryption
+Message received: Hello from 20, without E2E Encryption
+Received 5
diff --git a/basice2e/clients.goldoutput/client35.txt b/basice2e/clients.goldoutput/client35.txt
index 87ef8442cb54890d64bc25190a50198b37381c14..917ca25f7955d73add33602652e26f3b14ca4bf6 100644
--- a/basice2e/clients.goldoutput/client35.txt
+++ b/basice2e/clients.goldoutput/client35.txt
@@ -9,3 +9,14 @@ Message received: Hello from 2, without E2E Encryption
 Message received: Hello from 2, without E2E Encryption
 Message received: Hello from 2, without E2E Encryption
 Received 5
+Sent: Hello from 1, without E2E Encryption
+Sent: Hello from 1, without E2E Encryption
+Sent: Hello from 1, without E2E Encryption
+Sent: Hello from 1, without E2E Encryption
+Sent: Hello from 1, without E2E Encryption
+Message received: Hello from 2, without E2E Encryption
+Message received: Hello from 2, without E2E Encryption
+Message received: Hello from 2, without E2E Encryption
+Message received: Hello from 2, without E2E Encryption
+Message received: Hello from 2, without E2E Encryption
+Received 5
diff --git a/basice2e/clients.goldoutput/client36.txt b/basice2e/clients.goldoutput/client36.txt
index 403715dd1e3207f994a3456c81fc591a0c6590ce..b5e84251ca797fa95730b433ae8845aeeaa72c08 100644
--- a/basice2e/clients.goldoutput/client36.txt
+++ b/basice2e/clients.goldoutput/client36.txt
@@ -9,3 +9,14 @@ Message received: Hello from 1, without E2E Encryption
 Message received: Hello from 1, without E2E Encryption
 Message received: Hello from 1, without E2E Encryption
 Received 5
+Sent: Hello from 2, without E2E Encryption
+Sent: Hello from 2, without E2E Encryption
+Sent: Hello from 2, without E2E Encryption
+Sent: Hello from 2, without E2E Encryption
+Sent: Hello from 2, without E2E Encryption
+Message received: Hello from 1, without E2E Encryption
+Message received: Hello from 1, without E2E Encryption
+Message received: Hello from 1, without E2E Encryption
+Message received: Hello from 1, without E2E Encryption
+Message received: Hello from 1, without E2E Encryption
+Received 5
diff --git a/basice2e/run.sh b/basice2e/run.sh
index b4a2d137a9bdd21f290f98ae059359eb2c979a61..b34f3896e27d461336f7142b4bb30bed5a9de102 100755
--- a/basice2e/run.sh
+++ b/basice2e/run.sh
@@ -393,44 +393,42 @@ PIDVAL2=$!
 echo "$CLIENTCMD -- $PIDVAL"
 wait $PIDVAL2
 
+echo "CREATING USERS for REKEY TEST..."
+JAKEID=$(../bin/client init -s blob100 -l $CLIENTOUT/client100.log --password hello --ndf results/ndf.json --writeContact $CLIENTOUT/Jake100-contact.bin -v $DEBUGLEVEL)
+NIAMHID=$(../bin/client init -s blob101 -l $CLIENTOUT/client101.log --password hello --ndf results/ndf.json --writeContact $CLIENTOUT/Niamh101-contact.bin -v $DEBUGLEVEL)
+echo "JAKE ID: $JAKEID"
+echo "NIAMH ID: $NIAMHID"
 
-########### KEEP COMMENTED OUT, UNTIL TESTS ARE FIXED ################################
-# echo "CREATING USERS for REKEY TEST..."
-# JAKEID=$(../bin/client init -s blob100 -l $CLIENTOUT/client100.log --password hello --ndf results/ndf.json --writeContact $CLIENTOUT/Jake100-contact.bin -v $DEBUGLEVEL)
-# NIAMHID=$(../bin/client init -s blob101 -l $CLIENTOUT/client101.log --password hello --ndf results/ndf.json --writeContact $CLIENTOUT/Niamh101-contact.bin -v $DEBUGLEVEL)
-# echo "JAKE ID: $JAKEID"
-# echo "NIAMH ID: $NIAMHID"
 
+REKEYOPTS="--e2eMaxKeys 15 --e2eMinKeys 10 --e2eNumReKeys 5"
+# Client 101 will now send auth request
+CLIENTCMD="timeout 240s ../bin/client $CLIENTOPTS $REKEYOPTS -l $CLIENTOUT/client101.log -s blob101 --writeContact $CLIENTOUT/Niamh101-contact.bin --destfile $CLIENTOUT/Jake100-contact.bin --send-auth-request --sendCount 0 --receiveCount 0"
+eval $CLIENTCMD >> $CLIENTOUT/client101.txt || true &
+PIDVAL2=$!
+echo "$CLIENTCMD -- $PIDVAL"
+# Client 100 will now wait for client 101's E2E Auth channel request and confirm
+CLIENTCMD="timeout 240s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client100.log -s blob100 --destid b64:$NIAMHID --sendCount 0 --receiveCount 0"
+eval $CLIENTCMD >> $CLIENTOUT/client100.txt || true &
+PIDVAL=$!
+echo "$CLIENTCMD -- $PIDVAL"
+wait $PIDVAL
+wait $PIDVAL2
 
-# REKEYOPTS="--e2eMaxKeys 15 --e2eMinKeys 10 --e2eNumReKeys 5"
-# # Client 101 will now send auth request
-# CLIENTCMD="timeout 240s ../bin/client $CLIENTOPTS $REKEYOPTS -l $CLIENTOUT/client101.log -s blob101 --writeContact $CLIENTOUT/Niamh101-contact.bin --destfile $CLIENTOUT/Jake100-contact.bin --send-auth-request --sendCount 0 --receiveCount 0"
-# eval $CLIENTCMD >> $CLIENTOUT/client101.txt || true &
-# PIDVAL2=$!
-# echo "$CLIENTCMD -- $PIDVAL"
-# # Client 100 will now wait for client 101's E2E Auth channel request and confirm
-# CLIENTCMD="timeout 240s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client100.log -s blob100 --destid b64:$NIAMHID --sendCount 0 --receiveCount 0"
-# eval $CLIENTCMD >> $CLIENTOUT/client100.txt || true &
-# PIDVAL=$!
-# echo "$CLIENTCMD -- $PIDVAL"
-# wait $PIDVAL
-# wait $PIDVAL2
-
-# echo "RUNNING REKEY TEST..."
-# # Test destid syntax too, note wait for 11 messages to catch the message from above ^^^
-# CLIENTCMD="timeout 240s ../bin/client $CLIENTOPTS $REKEYOPTS -l $CLIENTOUT/client100.log -s blob100 --destid b64:$NIAMHID --sendCount 20 --receiveCount 20 -m \"Hello from Jake100, with E2E Encryption\""
-# eval $CLIENTCMD >> $CLIENTOUT/client100.txt || true &
-# PIDVAL=$!
-# echo "$CLIENTCMD -- $PIDVAL"
-# CLIENTCMD="timeout 240s ../bin/client $CLIENTOPTS $REKEYOPTS -l $CLIENTOUT/client101.log -s blob101 --destid b64:$JAKEID --sendCount 20 --receiveCount 20 -m \"Hello from Niamh101, with E2E Encryption\""
-# eval $CLIENTCMD >> $CLIENTOUT/client101.txt || true &
-# PIDVAL2=$!
-# echo "$CLIENTCMD -- $PIDVAL"
-# wait $PIDVAL
-# wait $PIDVAL2
+echo "RUNNING REKEY TEST..."
+# Test destid syntax too, note wait for 11 messages to catch the message from above ^^^
+CLIENTCMD="timeout 240s ../bin/client $CLIENTOPTS $REKEYOPTS -l $CLIENTOUT/client100.log -s blob100 --destid b64:$NIAMHID --sendCount 20 --receiveCount 20 -m \"Hello from Jake100, with E2E Encryption\""
+eval $CLIENTCMD >> $CLIENTOUT/client100.txt || true &
+PIDVAL=$!
+echo "$CLIENTCMD -- $PIDVAL"
+CLIENTCMD="timeout 240s ../bin/client $CLIENTOPTS $REKEYOPTS -l $CLIENTOUT/client101.log -s blob101 --destid b64:$JAKEID --sendCount 20 --receiveCount 20 -m \"Hello from Niamh101, with E2E Encryption\""
+eval $CLIENTCMD >> $CLIENTOUT/client101.txt || true &
+PIDVAL2=$!
+echo "$CLIENTCMD -- $PIDVAL"
+wait $PIDVAL
+wait $PIDVAL2
 
-# # Now we are just going to exhaust all the keys we have and see if we
-# # use the unconfirmed channels
+# Now we are just going to exhaust all the keys we have and see if we
+# use the unconfirmed channels
 # CLIENTCMD="timeout 240s ../bin/client $CLIENTOPTS $REKEYOPTS -l $CLIENTOUT/client100.log -s blob100 --destid b64:$NIAMHID --sendCount 20 --receiveCount 0 -m \"Hello from Jake100, with E2E Encryption\""
 # eval $CLIENTCMD >> $CLIENTOUT/client100.txt || true &
 # PIDVAL=$!
@@ -444,32 +442,30 @@ wait $PIDVAL2
 # wait $PIDVAL2
 
 
-# echo "FORCING HISTORICAL ROUNDS..."
-# CLIENTCMD="timeout 240s ../bin/client $CLIENTOPTS --forceHistoricalRounds --unsafe -l $CLIENTOUT/client35.log -s blob35 --sendid 1 --destid 2 --sendCount 5 --receiveCount 5 -m \"Hello from 1, without E2E Encryption\""
-# eval $CLIENTCMD >> $CLIENTOUT/client35.txt || true &
-# PIDVAL=$!
-# echo "$CLIENTCMD -- $PIDVAL"
-# CLIENTCMD="timeout 240s ../bin/client $CLIENTOPTS --forceHistoricalRounds --unsafe -l $CLIENTOUT/client36.log -s blob36 --sendid 2 --destid 1 --sendCount 5 --receiveCount 5 -m \"Hello from 2, without E2E Encryption\""
-# eval $CLIENTCMD >> $CLIENTOUT/client36.txt || true &
-# PIDVAL2=$!
-# echo "$CLIENTCMD -- $PIDVAL"
-# wait $PIDVAL
-# wait $PIDVAL2
-
-# echo "FORCING MESSAGE PICKUP RETRY... "
-# # Higher timeouts for this test to allow message pickup retry to function
-# CLIENTCMD="timeout 360s ../bin/client $CLIENTOPTS --forceMessagePickupRetry -l $CLIENTOUT/client20.log -s blob20 --sendid 20 --destid 21 --sendCount 5 --receiveCount 5 -m \"Hello from 20, without E2E Encryption\""
-# eval $CLIENTCMD >> $CLIENTOUT/client20.txt || true &
-# PIDVAL=$!
-# echo "$CLIENTCMD -- $PIDVAL"
-# CLIENTCMD="timeout 360s ../bin/client $CLIENTOPTS --forceMessagePickupRetry -l $CLIENTOUT/client21.log -s blob21 --sendid 21 --destid 20 --sendCount 5 --receiveCount 5 -m \"Hello from 21, without E2E Encryption\""
-# eval $CLIENTCMD >> $CLIENTOUT/client21.txt || true &
-# PIDVAL2=$!
-# echo "$CLIENTCMD -- $PIDVAL"
-# wait $PIDVAL
-# wait $PIDVAL2
+echo "FORCING HISTORICAL ROUNDS..."
+CLIENTCMD="timeout 240s ../bin/client $CLIENTOPTS --forceHistoricalRounds --unsafe -l $CLIENTOUT/client35.log -s blob35 --sendid 1 --destid 2 --sendCount 5 --receiveCount 5 -m \"Hello from 1, without E2E Encryption\""
+eval $CLIENTCMD >> $CLIENTOUT/client35.txt || true &
+PIDVAL=$!
+echo "$CLIENTCMD -- $PIDVAL"
+CLIENTCMD="timeout 240s ../bin/client $CLIENTOPTS --forceHistoricalRounds --unsafe -l $CLIENTOUT/client36.log -s blob36 --sendid 2 --destid 1 --sendCount 5 --receiveCount 5 -m \"Hello from 2, without E2E Encryption\""
+eval $CLIENTCMD >> $CLIENTOUT/client36.txt || true &
+PIDVAL2=$!
+echo "$CLIENTCMD -- $PIDVAL"
+wait $PIDVAL
+wait $PIDVAL2
 
-################### Do not uncomment above, it was meant to be commented out
+echo "FORCING MESSAGE PICKUP RETRY... "
+# Higher timeouts for this test to allow message pickup retry to function
+CLIENTCMD="timeout 360s ../bin/client $CLIENTOPTS --forceMessagePickupRetry -l $CLIENTOUT/client20.log -s blob20 --sendid 20 --destid 21 --sendCount 5 --receiveCount 5 -m \"Hello from 20, without E2E Encryption\""
+eval $CLIENTCMD >> $CLIENTOUT/client20.txt || true &
+PIDVAL=$!
+echo "$CLIENTCMD -- $PIDVAL"
+CLIENTCMD="timeout 360s ../bin/client $CLIENTOPTS --forceMessagePickupRetry -l $CLIENTOUT/client21.log -s blob21 --sendid 21 --destid 20 --sendCount 5 --receiveCount 5 -m \"Hello from 21, without E2E Encryption\""
+eval $CLIENTCMD >> $CLIENTOUT/client21.txt || true &
+PIDVAL2=$!
+echo "$CLIENTCMD -- $PIDVAL"
+wait $PIDVAL
+wait $PIDVAL2
 
 # Proto user test: client25 and client26 generate a proto user JSON file and close.
 # Both clients are restarted and load from their respective proto user files and attempt to send.