diff --git a/basice2e/clients.goldoutput/client18.out b/basice2e/clients.goldoutput/client18.out
index 5b112177aaabcfd443d12183d0cc523a255ebe78..6c5b3a123f85088fdaf06340aa55afd17f60bfca 100644
--- a/basice2e/clients.goldoutput/client18.out
+++ b/basice2e/clients.goldoutput/client18.out
@@ -1 +1,2 @@
 Received: Hello, 18, with E2E Encryption
+Sending Message to 9, Spencer: Hello, 9, with E2E Encryption
diff --git a/basice2e/clients.goldoutput/client9.out b/basice2e/clients.goldoutput/client9.out
index 71a54859f4b110895d0b7fd7b537037eaf6f0b9b..3206400c8bc6f094e33060bce3f6095d260721b1 100644
--- a/basice2e/clients.goldoutput/client9.out
+++ b/basice2e/clients.goldoutput/client9.out
@@ -1 +1,2 @@
 Received: Hello, 9, with E2E Encryption
+Sending Message to 18, Bernardo: Hello, 18, with E2E Encryption
diff --git a/build.sh b/build.sh
index f131349454dc3c9b53e2356399b4d6b52a67b63c..8ad2cbaf649a2e07f12a705300026c0cc56092b5 100755
--- a/build.sh
+++ b/build.sh
@@ -4,6 +4,7 @@
 # and assumes that you've cloned the Go repos to your GOPATH and updated them
 # with Glide.
 
+set -x
 mkdir -p bin
 pushd bin
 go build gitlab.com/elixxir/client
diff --git a/update.sh b/update.sh
index 53d96901c5c3af6e71784b259d35b737e4535862..08b006b29d03d62218031080591dfa3f9cc8deaa 100755
--- a/update.sh
+++ b/update.sh
@@ -3,59 +3,18 @@
 # This intended for updating the tested repos and their dependencies to the
 # latest versions before running the integration test.
 
-git pull
-rm -fr ~/.glide
-
 update() {
     git stash
     git clean -ffdx
     git checkout master
     git pull
-    glide cc
-    glide up
+    glide cc && glide up
 }
 
-pushd $GOPATH/src/gitlab.com/elixxir/client
-update
-popd
-
-pushd $GOPATH/src/gitlab.com/elixxir/server
-update
-popd
-
-pushd $GOPATH/src/gitlab.com/elixxir/channelbot
-update
-popd
-
-pushd $GOPATH/src/gitlab.com/elixxir/user-discovery-bot
-update
-popd
-
-pushd $GOPATH/src/gitlab.com/elixxir/gateway
-update
-popd
-
-pushd $GOPATH/src/gitlab.com/elixxir/comms
-update
-popd
-
-pushd $GOPATH/src/gitlab.com/elixxir/crypto
-update
-popd
-
-pushd $GOPATH/src/gitlab.com/elixxir/client-consoleUI
-update
-popd
-
-pushd $GOPATH/src/gitlab.com/elixxir/primitives
-update
-popd
-
-pushd $GOPATH/src/gitlab.com/elixxir/registration
-update
-popd
-
-pushd ..
-go test ./...
-popd
-
+for DIR in client server gateway user-discovery-bot registration; do
+    echo $DIR
+    pushd $GOPATH/src/gitlab.com/elixxir/client
+    update
+    go test ./...
+    popd
+done