diff --git a/basice2e/clients.goldoutput/client20.txt b/basice2e/clients.goldoutput/client20.txt
index 6d51126e280be9854af4f996daf99ab4d6e94458..2b10e4046835de371f6c155d4167bd3efefa75c4 100644
--- a/basice2e/clients.goldoutput/client20.txt
+++ b/basice2e/clients.goldoutput/client20.txt
@@ -5,6 +5,12 @@ 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
+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
 Message received: Hello from 21, without E2E Encryption
@@ -12,7 +18,7 @@ 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 7
+Received 10
 Sent: Hello from 20, without E2E Encryption
 Sent: Hello from 20, without E2E Encryption
 Sent: Hello from 20, without E2E Encryption
@@ -20,6 +26,12 @@ 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
+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
 Message received: Hello from 21, without E2E Encryption
@@ -27,4 +39,4 @@ 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 7
+Received 10
diff --git a/basice2e/clients.goldoutput/client21.txt b/basice2e/clients.goldoutput/client21.txt
index 837d11381f7582af57dd9bd27323df9088695973..8e2a3adfa6b5c21923e8bc8551386c908be3f612 100644
--- a/basice2e/clients.goldoutput/client21.txt
+++ b/basice2e/clients.goldoutput/client21.txt
@@ -4,27 +4,23 @@ 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
 Message received: Hello from 20, without E2E Encryption
 Message received: Hello from 20, without E2E Encryption
-Received 7
+Received 6
 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
 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
 Message received: Hello from 20, without E2E Encryption
 Message received: Hello from 20, without E2E Encryption
-Received 7
+Received 6
diff --git a/basice2e/run.sh b/basice2e/run.sh
index 0e95dabe9936e055164b203cd6edf862a2041a54..4221c474dcf61fa99a8e2020b247e72797d2819b 100755
--- a/basice2e/run.sh
+++ b/basice2e/run.sh
@@ -272,11 +272,11 @@ then
 
     echo "FORCING MESSAGE PICKUP RETRY... (NON-E2E, PRECAN)"
     # Higher timeouts for this test to allow message pickup retry to function
-    CLIENTCMD="timeout 300s ../bin/client $CLIENTOPTS --forceMessagePickupRetry --unsafe -l $CLIENTOUT/client20.log -s blob20 --sendid 20 --destid 21 --sendCount 7 --receiveCount 7 -m \"Hello from 20, without E2E Encryption\""
+    CLIENTCMD="timeout 300s ../bin/client $CLIENTOPTS --forceMessagePickupRetry --unsafe -l $CLIENTOUT/client20.log -s blob20 --sendid 20 --destid 21 --sendCount 10 --receiveCount 10 -m \"Hello from 20, without E2E Encryption\""
     eval $CLIENTCMD >> $CLIENTOUT/client20.txt || true &
     PIDVAL=$!
     echo "$CLIENTCMD -- $PIDVAL"
-    CLIENTCMD="timeout 300s ../bin/client $CLIENTOPTS --forceMessagePickupRetry --unsafe -l $CLIENTOUT/client21.log -s blob21 --sendid 21 --destid 20 --sendCount 7 --receiveCount 7 -m \"Hello from 21, without E2E Encryption\""
+    CLIENTCMD="timeout 300s ../bin/client $CLIENTOPTS --forceMessagePickupRetry --unsafe -l $CLIENTOUT/client21.log -s blob21 --sendid 21 --destid 20 --sendCount 10 --receiveCount 10 -m \"Hello from 21, without E2E Encryption\""
     eval $CLIENTCMD >> $CLIENTOUT/client21.txt || true &
     PIDVAL2=$!
     echo "$CLIENTCMD -- $PIDVAL"
@@ -404,11 +404,11 @@ wait $PIDVAL2
 
 echo "FORCING MESSAGE PICKUP RETRY... "
 # Higher timeouts for this test to allow message pickup retry to function
-CLIENTCMD="timeout 300s ../bin/client $CLIENTOPTS --forceMessagePickupRetry -l $CLIENTOUT/client20.log -s blob20 --sendid 20 --destid 21 --sendCount 7 --receiveCount 7 -m \"Hello from 20, without E2E Encryption\""
+CLIENTCMD="timeout 300s ../bin/client $CLIENTOPTS --forceMessagePickupRetry -l $CLIENTOUT/client20.log -s blob20 --sendid 20 --destid 21 --sendCount 10 --receiveCount 10 -m \"Hello from 20, without E2E Encryption\""
 eval $CLIENTCMD >> $CLIENTOUT/client20.txt || true &
 PIDVAL=$!
 echo "$CLIENTCMD -- $PIDVAL"
-CLIENTCMD="timeout 300s ../bin/client $CLIENTOPTS --forceMessagePickupRetry -l $CLIENTOUT/client21.log -s blob21 --sendid 21 --destid 20 --sendCount 7 --receiveCount 7 -m \"Hello from 21, without E2E Encryption\""
+CLIENTCMD="timeout 300s ../bin/client $CLIENTOPTS --forceMessagePickupRetry -l $CLIENTOUT/client21.log -s blob21 --sendid 21 --destid 20 --sendCount 10 --receiveCount 10 -m \"Hello from 21, without E2E Encryption\""
 eval $CLIENTCMD >> $CLIENTOUT/client21.txt || true &
 PIDVAL2=$!
 echo "$CLIENTCMD -- $PIDVAL"