diff --git a/basice2e/clients.goldoutput/client200.txt b/basice2e/clients.goldoutput/client200.txt
index ce158d63c40bd04f284eaa422c671ab2378ca5e8..a0961cee047fba68d139fd027114f7c87ed70e86 100644
--- a/basice2e/clients.goldoutput/client200.txt
+++ b/basice2e/clients.goldoutput/client200.txt
@@ -1,5 +1,4 @@
-ConnectionServer heard message "Hello 200 from 201, using connections"
 Established connection server, begin listening...
 Established connection with client
-Established connection with client
+ConnectionServer heard message "Hello 200 from 201, using connections"
 Shutting down connection server
diff --git a/basice2e/clients.goldoutput/client201.txt b/basice2e/clients.goldoutput/client201.txt
index 79da732c81ee4e5c421ba2a539420a337da51d31..91a6b1ca6f6ab22b4116969c4a0e9b8dde84475c 100644
--- a/basice2e/clients.goldoutput/client201.txt
+++ b/basice2e/clients.goldoutput/client201.txt
@@ -2,7 +2,4 @@ Loading ephemerally
 Sending connection request
 Established connection with server
 Sent message "Hello 200 from 201, using connections" to connection partner.
-Loading ephemerally
-Sending connection request
-Established connection with server
 Disconnected from partner
diff --git a/basice2e/clients.goldoutput/client202.txt b/basice2e/clients.goldoutput/client202.txt
index 6b73f59e8cebed3a305b2bb8ba8bd2fa7fa84c39..9f7ecc3e28b84f56ef27f009957bd2a12faee3fa 100644
--- a/basice2e/clients.goldoutput/client202.txt
+++ b/basice2e/clients.goldoutput/client202.txt
@@ -1,5 +1,4 @@
 Established connection server, begin listening...
 Established authenticated connection with client
 AuthServer heard message "Hello 202 from 203, using connections"
-Established authenticated connection with client
-
+Shutting down connection server
diff --git a/basice2e/clients.goldoutput/client203.txt b/basice2e/clients.goldoutput/client203.txt
index 6608551fb458585fba1d72ed801f5a3cc3dadb59..1a64149708be88ab60abceef5e6f4e6c1903fcc6 100644
--- a/basice2e/clients.goldoutput/client203.txt
+++ b/basice2e/clients.goldoutput/client203.txt
@@ -2,7 +2,4 @@ Loading ephemerally
 Sending connection request
 Established authenticated connection with server.
 Sent message "Hello 202 from 203, using connections" to connection partner.
-Loading ephemerally
-Sending connection request
-Established authenticated connection with server.
 Disconnected from partner
diff --git a/basice2e/clients.goldoutput/client204.txt b/basice2e/clients.goldoutput/client204.txt
index 832c11da1630aacc2aa81275562d5695160e6a53..9b31c61fd3b4fb95f033dccc201514c5ebcb53d1 100644
--- a/basice2e/clients.goldoutput/client204.txt
+++ b/basice2e/clients.goldoutput/client204.txt
@@ -1,3 +1,4 @@
 Established connection server, begin listening...
 Established connection with client
-ConnectionServer heard message "Hello 200 from 201, using connections"
+ConnectionServer heard message "Hello 204 from 205, using connections"
+Shutting down connection server
diff --git a/basice2e/clients.goldoutput/client205.txt b/basice2e/clients.goldoutput/client205.txt
index 79da732c81ee4e5c421ba2a539420a337da51d31..cd183e9af416d1ce2fb0fc83fed48d1112966647 100644
--- a/basice2e/clients.goldoutput/client205.txt
+++ b/basice2e/clients.goldoutput/client205.txt
@@ -1,8 +1,5 @@
-Loading ephemerally
+Loading non-ephemerally
 Sending connection request
 Established connection with server
-Sent message "Hello 200 from 201, using connections" to connection partner.
-Loading ephemerally
-Sending connection request
-Established connection with server
-Disconnected from partner
+Sent message "Hello 204 from 205, using connections" to connection partner.
+Disconnected from partner
\ No newline at end of file
diff --git a/basice2e/clients.goldoutput/client206.txt b/basice2e/clients.goldoutput/client206.txt
index 6b73f59e8cebed3a305b2bb8ba8bd2fa7fa84c39..7e8a2e3cc873193f6ec4e9ed7642f35dee608e9f 100644
--- a/basice2e/clients.goldoutput/client206.txt
+++ b/basice2e/clients.goldoutput/client206.txt
@@ -1,5 +1,4 @@
 Established connection server, begin listening...
 Established authenticated connection with client
-AuthServer heard message "Hello 202 from 203, using connections"
-Established authenticated connection with client
-
+AuthServer heard message "Hello 206 from 207, using connections"
+Shutting down connection server
diff --git a/basice2e/clients.goldoutput/client207.txt b/basice2e/clients.goldoutput/client207.txt
index 6608551fb458585fba1d72ed801f5a3cc3dadb59..fdabfedc66a42aa737f51d81619730576f72fee6 100644
--- a/basice2e/clients.goldoutput/client207.txt
+++ b/basice2e/clients.goldoutput/client207.txt
@@ -1,8 +1,5 @@
-Loading ephemerally
-Sending connection request
-Established authenticated connection with server.
-Sent message "Hello 202 from 203, using connections" to connection partner.
-Loading ephemerally
+Loading non-ephemerally
 Sending connection request
 Established authenticated connection with server.
+Sent message "Hello 206 from 207, using connections" to connection partner.
 Disconnected from partner
diff --git a/basice2e/run.sh b/basice2e/run.sh
index a49580957576da053f4ca311371547210684966e..15dc7149425d167a3d46b6db159a80ad506472cd 100755
--- a/basice2e/run.sh
+++ b/basice2e/run.sh
@@ -1109,27 +1109,20 @@ echo "BROADCAST CHANNELS FINISHED..."
 
 echo "TESTING EPEHMERAL CONNECTIONS..."
 # Initiate server
-CLIENTCMD="timeout 240s ../bin/client connection --ephemeral -s blob200 $CONNECTIONOPTS --writeContact $CLIENTOUT/client200-server.bin -l $CLIENTOUT/client200.log --startServer --serverTimeout 2m"
+CLIENTCMD="timeout 240s ../bin/client connection --ephemeral -s blob200 $CONNECTIONOPTS --writeContact $CLIENTOUT/client200-server.bin -l $CLIENTOUT/client200.log --startServer --serverTimeout 1m30s"
 eval $CLIENTCMD > $CLIENTOUT/client200.txt 2>&1 || true &
 PIDVAL1=$!
 echo "$CLIENTCMD -- $PIDVAL1"
 echo "Sleeping to ensure connection server instantiation"
 sleep 5
+
 # Initiate client and send message to server
 CLIENTCMD="timeout 240s ../bin/client connection --ephemeral -s blob201 --connect $CLIENTOUT/client200-server.bin $CONNECTIONOPTS -l $CLIENTOUT/client201.log  -m \"Hello 200 from 201, using connections\" --receiveCount 0"
 eval $CLIENTCMD > $CLIENTOUT/client201.txt 2>&1 || true &
 PIDVAL2=$!
 echo "$CLIENTCMD -- $PIDVAL2"
 wait $PIDVAL2
-
-# Disconnect
-CLIENTCMD="timeout 240s ../bin/client connection --ephemeral -s blob201 $CONNECTIONOPTS -l $CLIENTOUT/client201.log --connect $CLIENTOUT/client200-server.bin --disconnect"
-eval $CLIENTCMD >> $CLIENTOUT/client201.txt 2>&1 || true &
-PIDVAL2=$!
-echo "$CLIENTCMD -- $PIDVAL2"
-wait $PIDVAL2
 wait $PIDVAL1
-
 echo "EPHEMERAL CONNECTION TESTS FINISHED"
 
 ###############################################################################
@@ -1137,7 +1130,7 @@ echo "EPHEMERAL CONNECTION TESTS FINISHED"
 ###############################################################################
 echo "TESTING EPHEMERAL AUTHENTICATED CONNECTIONS..."
 # Initiate server
-CLIENTCMD="timeout 240s ../bin/client connection --ephemeral -s blob202 --authenticated $CONNECTIONOPTS --writeContact $CLIENTOUT/client202-server.bin -l $CLIENTOUT/client202.log --startServer --serverTimeout 2m"
+CLIENTCMD="timeout 240s ../bin/client connection --ephemeral -s blob202 --authenticated $CONNECTIONOPTS --writeContact $CLIENTOUT/client202-server.bin -l $CLIENTOUT/client202.log --startServer --serverTimeout 1m30s"
 eval $CLIENTCMD > $CLIENTOUT/client202.txt 2>&1 || true &
 PIDVAL1=$!
 echo "$CLIENTCMD -- $PIDVAL1"
@@ -1150,15 +1143,7 @@ eval $CLIENTCMD > $CLIENTOUT/client203.txt 2>&1 || true &
 PIDVAL2=$!
 echo "$CLIENTCMD -- $PIDVAL2"
 wait $PIDVAL2
-
-# Disconnect
-CLIENTCMD="timeout 240s ../bin/client connection --ephemeral -s blob203 --authenticated $CONNECTIONOPTS -l $CLIENTOUT/client203.log --connect $CLIENTOUT/client202-server.bin --disconnect"
-eval $CLIENTCMD >> $CLIENTOUT/client203.txt 2>&1 || true &
-PIDVAL2=$!
-echo "$CLIENTCMD -- $PIDVAL2"
-wait $PIDVAL2
 wait $PIDVAL1
-
 echo "EPHEMERAL AUTHENTICATED CONNECTION TESTS FINISHED"
 
 ###############################################################################
@@ -1167,32 +1152,25 @@ echo "EPHEMERAL AUTHENTICATED CONNECTION TESTS FINISHED"
 
 echo "TESTING NON-EPHEMERAL CONNECTIONS"
 # Initiate server
-CLIENTCMD="timeout 240s ../bin/client connection -s blob204 $CONNECTIONOPTS --writeContact $CLIENTOUT/client204-server.bin -l $CLIENTOUT/client204.log --startServer --serverTimeout 2m"
+CLIENTCMD="timeout 240s ../bin/client connection -s blob204 $CONNECTIONOPTS --writeContact $CLIENTOUT/client204-server.bin -l $CLIENTOUT/client204.log --startServer --serverTimeout 1m30s"
 eval $CLIENTCMD > $CLIENTOUT/client204.txt 2>&1 || true &
 PIDVAL1=$!
 echo "$CLIENTCMD -- $PIDVAL1"
 echo "Sleeping to ensure connection server instantiation"
 sleep 5
+
 # Initiate client and send message to server
 CLIENTCMD="timeout 240s ../bin/client connection -s blob205 --connect $CLIENTOUT/client204-server.bin $CONNECTIONOPTS -l $CLIENTOUT/client205.log  -m \"Hello 204 from 205, using connections\" --receiveCount 0"
 eval $CLIENTCMD > $CLIENTOUT/client205.txt 2>&1 || true &
 PIDVAL2=$!
 echo "$CLIENTCMD -- $PIDVAL2"
 wait $PIDVAL2
-
-# Disconnect
-CLIENTCMD="timeout 240s ../bin/client connection -s blob205 $CONNECTIONOPTS -l $CLIENTOUT/client205.log --connect $CLIENTOUT/client204-server.bin --disconnect"
-eval $CLIENTCMD >> $CLIENTOUT/client205.txt 2>&1 || true &
-PIDVAL2=$!
-echo "$CLIENTCMD -- $PIDVAL2"
-wait $PIDVAL2
 wait $PIDVAL1
 echo "NON-EPHEMERAL CONNECTION TEST FINISHED."
 
-
 echo "TESTING EPHEMERAL AUTHENTICATED CONNECTIONS..."
 # Initiate server
-CLIENTCMD="timeout 240s ../bin/client connection -s blob206 --authenticated $CONNECTIONOPTS --writeContact $CLIENTOUT/client206-server.bin -l $CLIENTOUT/client206.log --startServer --serverTimeout 2m"
+CLIENTCMD="timeout 240s ../bin/client connection -s blob206 --authenticated $CONNECTIONOPTS --writeContact $CLIENTOUT/client206-server.bin -l $CLIENTOUT/client206.log --startServer --serverTimeout 1m30s"
 eval $CLIENTCMD > $CLIENTOUT/client206.txt 2>&1 || true &
 PIDVAL1=$!
 echo "$CLIENTCMD -- $PIDVAL1"
@@ -1205,13 +1183,6 @@ eval $CLIENTCMD > $CLIENTOUT/client207.txt 2>&1 || true &
 PIDVAL2=$!
 echo "$CLIENTCMD -- $PIDVAL2"
 wait $PIDVAL2
-
-# Disconnect
-CLIENTCMD="timeout 240s ../bin/client connection -s blob207 --authenticated $CONNECTIONOPTS -l $CLIENTOUT/client207.log --connect $CLIENTOUT/client206-server.bin --disconnect"
-eval $CLIENTCMD >> $CLIENTOUT/client207.txt 2>&1 || true &
-PIDVAL2=$!
-echo "$CLIENTCMD -- $PIDVAL2"
-wait $PIDVAL2
 wait $PIDVAL1
 echo "Non-Ephemeral Test Complete."