diff --git a/basice2e/clients.goldoutput/client100.txt b/basice2e/clients.goldoutput/client100.txt
index 60a451c6d7057f4effa0f3b554f5af14db0755b9..bc8b717c438baf21db06a362c7d912b23ea077fc 100644
--- a/basice2e/clients.goldoutput/client100.txt
+++ b/basice2e/clients.goldoutput/client100.txt
@@ -17,6 +17,8 @@ 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: type is KeyExchangeConfirm
 Message received: type is KeyExchangeTrigger
 Received 0
diff --git a/basice2e/clients.goldoutput/client101.txt b/basice2e/clients.goldoutput/client101.txt
index c440d1bf0a307cb47cada7ab8229fb3034ac15f8..c8de02f1a38940d55d6fa42766f0bc6fffa2155e 100644
--- a/basice2e/clients.goldoutput/client101.txt
+++ b/basice2e/clients.goldoutput/client101.txt
@@ -36,10 +36,14 @@ 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: type is KeyExchangeConfirm
 Message received: type is KeyExchangeTrigger
 Received 0
 Received 20
+Received 20
 Sent: Hello from Niamh101, with E2E Encryption
 Sent: Hello from Niamh101, with E2E Encryption
 Sent: Hello from Niamh101, with E2E Encryption
diff --git a/basice2e/run.sh b/basice2e/run.sh
index 77affdf174481c67a87d18c76d69d3d5cc3efa43..3fd01ffabbe1ca3b93b4809da15bcfdfc1274070 100755
--- a/basice2e/run.sh
+++ b/basice2e/run.sh
@@ -35,7 +35,7 @@ CLIENTUDOPTS="--password hello --ndf results/ndf.json -v $DEBUGLEVEL"
 CLIENTSINGLEOPTS="--password hello --waitTimeout 360 --ndf results/ndf.json -v $DEBUGLEVEL"
 CLIENTGROUPOPTS="--password hello --waitTimeout 600 --ndf results/ndf.json -v $DEBUGLEVEL"
 CLIENTFILETRANSFEROPTS="--password hello --waitTimeout 600 --ndf results/ndf.json -v $DEBUGLEVEL"
-CLIENTREKEYOPTS="--password hello --ndf results/ndf.json --verify-sends --waitTimeout 420 --unsafe-channel-creation -v $DEBUGLEVEL"
+CLIENTREKEYOPTS="--password hello --ndf results/ndf.json --verify-sends --waitTimeout 600 --unsafe-channel-creation -v $DEBUGLEVEL"
 CLIENTBACKUPOPTS="--password hello --ndf results/ndf.json -v $DEBUGLEVEL"
 
 mkdir -p $SERVERLOGS
@@ -530,11 +530,11 @@ wait $PIDVAL2
 
 echo "RUNNING REKEY TEST..."
 # Test destid syntax too, note wait for 11 messages to catch the message from above ^^^
-CLIENTCMD="timeout 360s ../bin/client $CLIENTOPTS $REKEYOPTS -l $CLIENTOUT/client100.log -s blob100 --destid b64:$NIAMHID --sendCount 20 --receiveCount 20 -m \"Hello from Jake100, with E2E Encryption\""
+CLIENTCMD="timeout 600s ../bin/client $CLIENTREKEYOPTS $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 360s ../bin/client $CLIENTOPTS $REKEYOPTS -l $CLIENTOUT/client101.log -s blob101 --destid b64:$JAKEID --sendCount 20 --receiveCount 20 -m \"Hello from Niamh101, with E2E Encryption\""
+CLIENTCMD="timeout 600s ../bin/client $CLIENTREKEYOPTS $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"
@@ -543,12 +543,12 @@ wait $PIDVAL2
 
 # Now we are just going to exhaust all the keys we have and see if we
 # use the unconfirmed channels
-CLIENTCMD="timeout 420s ../bin/client $CLIENTREKEYOPTS $REKEYOPTS -l $CLIENTOUT/client100.log -s blob100 --destid b64:$NIAMHID --sendCount 20 --receiveCount 0 -m \"Hello from Jake100, with E2E Encryption\""
+CLIENTCMD="timeout 600s ../bin/client $CLIENTREKEYOPTS $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=$!
 echo "$CLIENTCMD -- $PIDVAL"
 # And receive those messages sent to us
-CLIENTCMD="timeout 420s ../bin/client $CLIENTREKEYOPTS $REKEYOPTS -l $CLIENTOUT/client101.log -s blob101 --destid b64:$JAKEID --sendCount 0 --receiveCount 20"
+CLIENTCMD="timeout 600s ../bin/client $CLIENTREKEYOPTS $REKEYOPTS -l $CLIENTOUT/client101.log -s blob101 --destid b64:$JAKEID --sendCount 0 --receiveCount 20"
 eval $CLIENTCMD >> $CLIENTOUT/client101.txt || true &
 PIDVAL2=$!
 echo "$CLIENTCMD -- $PIDVAL"
@@ -1152,7 +1152,7 @@ fi
 
 
 set +x
-diff -aruN $GOLDOUTPUT $CLIENTCLEAN
+diff -aru $GOLDOUTPUT $CLIENTCLEAN
 cat $CLIENTOUT/client42.log | grep -a "Could not confirm authentication channel" > results/deleteContact.txt || true
 echo "CHECKING FOR SUCCESSFUL CONTACT DELETION"
 if [ -s results/deleteContact.txt ]