diff --git a/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/monitor_dockerfile b/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/monitor_dockerfile
index 08f08ae11..e8f803cde 100644
--- a/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/monitor_dockerfile
+++ b/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/monitor_dockerfile
@@ -4,6 +4,9 @@ MAINTAINER https://www.zerotier.com/
 
 EXPOSE 9993/udp
 
+# Install LWIP library used by service
+ADD liblwip.so /var/lib/zerotier-one/liblwip.so
+
 # Add ZT files
 RUN mkdir -p /var/lib/zerotier-one/networks.d
 ADD monitor_identity.public /var/lib/zerotier-one/identity.public
@@ -14,11 +17,6 @@ ADD *.name /
 ADD zerotier-one /
 ADD zerotier-cli /
 
-# Install LWIP library used by service
-ADD liblwip.so /
-RUN mkdir -p ext/bin/lwip
-RUN cp liblwip.so ext/bin/lwip/liblwip.so
-
 # Start ZeroTier-One
 ADD monitor_entrypoint.sh /monitor_entrypoint.sh
 RUN chmod -v +x /monitor_entrypoint.sh
diff --git a/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/monitor_entrypoint.sh b/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/monitor_entrypoint.sh
index 79d4391d8..9e8f72530 100644
--- a/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/monitor_entrypoint.sh
+++ b/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/monitor_entrypoint.sh
@@ -26,15 +26,7 @@ echo '*** ZeroTier Network Containers Test Monitor'
 chown -R daemon /var/lib/zerotier-one
 chgrp -R daemon /var/lib/zerotier-one
 su daemon -s /bin/bash -c '/zerotier-one -d -U -p9993 >>/tmp/zerotier-one.out 2>&1'
-echo '*** Waiting for initial identity generation...'
-while [ ! -s /var/lib/zerotier-one/identity.secret ]; do
-	sleep 0.2
-done
-echo '*** Waiting for network config...'
 virtip4=""
-while [ ! -s /var/lib/zerotier-one/networks.d/"$nwconf" ]; do
-	sleep 0.2
-done
 while [ -z "$virtip4" ]; do
 	sleep 0.2
 	virtip4=`/zerotier-cli listnetworks | grep -F $nwid | cut -d ' ' -f 9 | sed 's/,/\n/g' | grep -F '.' | cut -d / -f 1`
@@ -63,7 +55,7 @@ tx_md5sum=$(<$tx_md5sumfile)
 
 echo '*** Comparing md5: ' "$rx_md5sum" ' and ' "$tx_md5sum"
 
-if [ $rx_md5sum != $tx_md5sum ]; 
+if [ "$rx_md5sum" != "$tx_md5sum" ]; 
 then
 	echo 'MD5 FAIL'
 	touch "$file_path$fail$test_name.txt"
@@ -72,6 +64,8 @@ else
 	echo 'MD5 OK'
 	touch "$file_path$ok$test_name.txt"
 	printf 'Test: md5 sum ok!\n' >> "$file_path$ok$test_name.txt"
+	cat "$rx_md5sumfile" >> "$file_path$ok$test_name.txt"
+	cat "$tx_md5sumfile" >> "$file_path$ok$test_name.txt"
 fi
 
 
diff --git a/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/netcon_dockerfile b/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/netcon_dockerfile
index bc7aeb293..3de8ed3f8 100644
--- a/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/netcon_dockerfile
+++ b/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/netcon_dockerfile
@@ -7,7 +7,10 @@ RUN yum -y update
 RUN yum -y install httpd-2.4.16-1.fc23.x86_64
 RUN yum clean all
 
-EXPOSE 9993/udp
+EXPOSE 9993/udp 80/udp
+
+# Install LWIP library used by service
+ADD liblwip.so /var/lib/zerotier-one/liblwip.so
 
 # Install syscall intercept library
 ADD zerotier-intercept /
@@ -32,10 +35,5 @@ ADD zerotier-cli /
 ADD netcon_entrypoint.sh /netcon_entrypoint.sh
 RUN chmod -v +x /netcon_entrypoint.sh
 
-# Install LWIP library used by service
-ADD liblwip.so /
-RUN mkdir -p ext/bin/lwip
-RUN cp liblwip.so ext/bin/lwip/liblwip.so
-
 # Start ZeroTier-One
 CMD ["./netcon_entrypoint.sh"]
diff --git a/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/netcon_entrypoint.sh b/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/netcon_entrypoint.sh
index fd47cf380..37277d53d 100644
--- a/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/netcon_entrypoint.sh
+++ b/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/netcon_entrypoint.sh
@@ -22,15 +22,7 @@ echo '*** ZeroTier Network Containers Test: ' "$test_name"
 chown -R daemon /var/lib/zerotier-one
 chgrp -R daemon /var/lib/zerotier-one
 su daemon -s /bin/bash -c '/zerotier-one -d -U -p9993 >>/tmp/zerotier-one.out 2>&1'
-echo '*** Waiting for initial identity generation...'
-while [ ! -s /var/lib/zerotier-one/identity.secret ]; do
-	sleep 0.2
-done
-echo '*** Waiting for network config...'
 virtip4=""
-while [ ! -s /var/lib/zerotier-one/networks.d/"$nwconf" ]; do
-	sleep 0.2
-done
 while [ -z "$virtip4" ]; do
 	sleep 0.2
 	virtip4=`/zerotier-cli listnetworks | grep -F $nwid | cut -d ' ' -f 9 | sed 's/,/\n/g' | grep -F '.' | cut -d / -f 1`
diff --git a/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/monitor_dockerfile b/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/monitor_dockerfile
index 08f08ae11..e8f803cde 100644
--- a/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/monitor_dockerfile
+++ b/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/monitor_dockerfile
@@ -4,6 +4,9 @@ MAINTAINER https://www.zerotier.com/
 
 EXPOSE 9993/udp
 
+# Install LWIP library used by service
+ADD liblwip.so /var/lib/zerotier-one/liblwip.so
+
 # Add ZT files
 RUN mkdir -p /var/lib/zerotier-one/networks.d
 ADD monitor_identity.public /var/lib/zerotier-one/identity.public
@@ -14,11 +17,6 @@ ADD *.name /
 ADD zerotier-one /
 ADD zerotier-cli /
 
-# Install LWIP library used by service
-ADD liblwip.so /
-RUN mkdir -p ext/bin/lwip
-RUN cp liblwip.so ext/bin/lwip/liblwip.so
-
 # Start ZeroTier-One
 ADD monitor_entrypoint.sh /monitor_entrypoint.sh
 RUN chmod -v +x /monitor_entrypoint.sh
diff --git a/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/monitor_entrypoint.sh b/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/monitor_entrypoint.sh
index 79d4391d8..9e8f72530 100644
--- a/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/monitor_entrypoint.sh
+++ b/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/monitor_entrypoint.sh
@@ -26,15 +26,7 @@ echo '*** ZeroTier Network Containers Test Monitor'
 chown -R daemon /var/lib/zerotier-one
 chgrp -R daemon /var/lib/zerotier-one
 su daemon -s /bin/bash -c '/zerotier-one -d -U -p9993 >>/tmp/zerotier-one.out 2>&1'
-echo '*** Waiting for initial identity generation...'
-while [ ! -s /var/lib/zerotier-one/identity.secret ]; do
-	sleep 0.2
-done
-echo '*** Waiting for network config...'
 virtip4=""
-while [ ! -s /var/lib/zerotier-one/networks.d/"$nwconf" ]; do
-	sleep 0.2
-done
 while [ -z "$virtip4" ]; do
 	sleep 0.2
 	virtip4=`/zerotier-cli listnetworks | grep -F $nwid | cut -d ' ' -f 9 | sed 's/,/\n/g' | grep -F '.' | cut -d / -f 1`
@@ -63,7 +55,7 @@ tx_md5sum=$(<$tx_md5sumfile)
 
 echo '*** Comparing md5: ' "$rx_md5sum" ' and ' "$tx_md5sum"
 
-if [ $rx_md5sum != $tx_md5sum ]; 
+if [ "$rx_md5sum" != "$tx_md5sum" ]; 
 then
 	echo 'MD5 FAIL'
 	touch "$file_path$fail$test_name.txt"
@@ -72,6 +64,8 @@ else
 	echo 'MD5 OK'
 	touch "$file_path$ok$test_name.txt"
 	printf 'Test: md5 sum ok!\n' >> "$file_path$ok$test_name.txt"
+	cat "$rx_md5sumfile" >> "$file_path$ok$test_name.txt"
+	cat "$tx_md5sumfile" >> "$file_path$ok$test_name.txt"
 fi
 
 
diff --git a/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/netcon_dockerfile b/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/netcon_dockerfile
index cce18b81e..3a17acddc 100644
--- a/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/netcon_dockerfile
+++ b/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/netcon_dockerfile
@@ -7,7 +7,10 @@ RUN yum -y update
 RUN yum -y install httpd-2.4.17-3.fc23.x86_64
 RUN yum clean all
 
-EXPOSE 9993/udp
+EXPOSE 9993/udp 80/udp
+
+# Install LWIP library used by service
+ADD liblwip.so /var/lib/zerotier-one/liblwip.so
 
 # Install syscall intercept library
 ADD zerotier-intercept /
@@ -32,10 +35,5 @@ ADD zerotier-cli /
 ADD netcon_entrypoint.sh /netcon_entrypoint.sh
 RUN chmod -v +x /netcon_entrypoint.sh
 
-# Install LWIP library used by service
-ADD liblwip.so /
-RUN mkdir -p ext/bin/lwip
-RUN cp liblwip.so ext/bin/lwip/liblwip.so
-
 # Start ZeroTier-One
 CMD ["./netcon_entrypoint.sh"]
diff --git a/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/netcon_entrypoint.sh b/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/netcon_entrypoint.sh
index fd47cf380..37277d53d 100644
--- a/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/netcon_entrypoint.sh
+++ b/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/netcon_entrypoint.sh
@@ -22,15 +22,7 @@ echo '*** ZeroTier Network Containers Test: ' "$test_name"
 chown -R daemon /var/lib/zerotier-one
 chgrp -R daemon /var/lib/zerotier-one
 su daemon -s /bin/bash -c '/zerotier-one -d -U -p9993 >>/tmp/zerotier-one.out 2>&1'
-echo '*** Waiting for initial identity generation...'
-while [ ! -s /var/lib/zerotier-one/identity.secret ]; do
-	sleep 0.2
-done
-echo '*** Waiting for network config...'
 virtip4=""
-while [ ! -s /var/lib/zerotier-one/networks.d/"$nwconf" ]; do
-	sleep 0.2
-done
 while [ -z "$virtip4" ]; do
 	sleep 0.2
 	virtip4=`/zerotier-cli listnetworks | grep -F $nwid | cut -d ' ' -f 9 | sed 's/,/\n/g' | grep -F '.' | cut -d / -f 1`
diff --git a/netcon/docker-test/httpd/httpd_demo/test.sh b/netcon/docker-test/httpd/httpd_demo/test.sh
deleted file mode 100755
index fa8daddd6..000000000
--- a/netcon/docker-test/httpd/httpd_demo/test.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-
-test_name=${PWD##*/}
-echo 'Building dockerfiles for test: ' "$test_name"
-touch "$test_name".name
-
-# Docker won't allow the inclusion of files outside of the build directory
-cp ../../*.conf .
-cp ../../zerotier-one zerotier-one
-cp ../../zerotier-cli zerotier-cli
-cp ../../zerotier-intercept zerotier-intercept
-cp ../../libzerotierintercept.so.1.0 libzerotierintercept.so.1.0
-cp ../../liblwip.so liblwip.so
-cp ../../netcon_identity.public netcon_identity.public
-cp ../../netcon_identity.secret netcon_identity.secret
-cp ../../monitor_identity.public monitor_identity.public
-cp ../../monitor_identity.secret monitor_identity.secret
-
-docker build --tag="$test_name" -f netcon_dockerfile .
-docker build --tag="$test_name"_monitor -f monitor_dockerfile .
-
-rm -f zerotier-one
-rm -f zerotier-cli
-rm -f zerotier-intercept
-rm -f libzerotierintercept.so.1.0
-rm -f liblwip.so
-rm -f netcon_identity.public
-rm -f netcon_identity.secret
-rm -f monitor_identity.public
-rm -f monitor_identity.secret
-rm -f *.conf
-rm -f *.name
-
-# Start netcon container to be tested
-docker run -d -it -v $PWD/../../_results:/opt/results --device=/dev/net/tun "$test_name":latest
-docker run -d -it -v $PWD/../../_results:/opt/results --device=/dev/net/tun "$test_name"_monitor:latest
-
-sleep 45s
-docker kill $(docker ps -a -q)
-
-rm -rf ../../_results/*.tmp
\ No newline at end of file
diff --git a/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/monitor_dockerfile b/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/monitor_dockerfile
index 08f08ae11..e8f803cde 100644
--- a/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/monitor_dockerfile
+++ b/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/monitor_dockerfile
@@ -4,6 +4,9 @@ MAINTAINER https://www.zerotier.com/
 
 EXPOSE 9993/udp
 
+# Install LWIP library used by service
+ADD liblwip.so /var/lib/zerotier-one/liblwip.so
+
 # Add ZT files
 RUN mkdir -p /var/lib/zerotier-one/networks.d
 ADD monitor_identity.public /var/lib/zerotier-one/identity.public
@@ -14,11 +17,6 @@ ADD *.name /
 ADD zerotier-one /
 ADD zerotier-cli /
 
-# Install LWIP library used by service
-ADD liblwip.so /
-RUN mkdir -p ext/bin/lwip
-RUN cp liblwip.so ext/bin/lwip/liblwip.so
-
 # Start ZeroTier-One
 ADD monitor_entrypoint.sh /monitor_entrypoint.sh
 RUN chmod -v +x /monitor_entrypoint.sh
diff --git a/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/monitor_entrypoint.sh b/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/monitor_entrypoint.sh
index d11fa6867..9e8f72530 100644
--- a/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/monitor_entrypoint.sh
+++ b/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/monitor_entrypoint.sh
@@ -26,15 +26,7 @@ echo '*** ZeroTier Network Containers Test Monitor'
 chown -R daemon /var/lib/zerotier-one
 chgrp -R daemon /var/lib/zerotier-one
 su daemon -s /bin/bash -c '/zerotier-one -d -U -p9993 >>/tmp/zerotier-one.out 2>&1'
-echo '*** Waiting for initial identity generation...'
-while [ ! -s /var/lib/zerotier-one/identity.secret ]; do
-	sleep 0.2
-done
-echo '*** Waiting for network config...'
 virtip4=""
-while [ ! -s /var/lib/zerotier-one/networks.d/"$nwconf" ]; do
-	sleep 0.2
-done
 while [ -z "$virtip4" ]; do
 	sleep 0.2
 	virtip4=`/zerotier-cli listnetworks | grep -F $nwid | cut -d ' ' -f 9 | sed 's/,/\n/g' | grep -F '.' | cut -d / -f 1`
@@ -63,7 +55,7 @@ tx_md5sum=$(<$tx_md5sumfile)
 
 echo '*** Comparing md5: ' "$rx_md5sum" ' and ' "$tx_md5sum"
 
-if [ ($rx_md5sum != $tx_md5sum) || ${#rx_md5sum}<5 || ${#tx_md5sum}<5 ]; 
+if [ "$rx_md5sum" != "$tx_md5sum" ]; 
 then
 	echo 'MD5 FAIL'
 	touch "$file_path$fail$test_name.txt"
@@ -72,6 +64,8 @@ else
 	echo 'MD5 OK'
 	touch "$file_path$ok$test_name.txt"
 	printf 'Test: md5 sum ok!\n' >> "$file_path$ok$test_name.txt"
+	cat "$rx_md5sumfile" >> "$file_path$ok$test_name.txt"
+	cat "$tx_md5sumfile" >> "$file_path$ok$test_name.txt"
 fi
 
 
diff --git a/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/netcon_dockerfile b/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/netcon_dockerfile
index 17d2287e1..e7b4ad342 100644
--- a/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/netcon_dockerfile
+++ b/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/netcon_dockerfile
@@ -7,7 +7,10 @@ RUN yum -y update
 RUN yum -y install nginx-1:1.8.0-13.fc23.x86_64
 RUN yum clean all
 
-EXPOSE 9993/udp
+EXPOSE 9993/udp 80/udp
+
+# Install LWIP library used by service
+ADD liblwip.so /var/lib/zerotier-one/liblwip.so
 
 # Install syscall intercept library
 ADD zerotier-intercept /
@@ -32,10 +35,5 @@ ADD zerotier-cli /
 ADD netcon_entrypoint.sh /netcon_entrypoint.sh
 RUN chmod -v +x /netcon_entrypoint.sh
 
-# Install LWIP library used by service
-ADD liblwip.so /
-RUN mkdir -p ext/bin/lwip
-RUN cp liblwip.so ext/bin/lwip/liblwip.so
-
 # Start ZeroTier-One
 CMD ["./netcon_entrypoint.sh"]
diff --git a/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/netcon_entrypoint.sh b/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/netcon_entrypoint.sh
index 3fd4ff4c0..d11381119 100644
--- a/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/netcon_entrypoint.sh
+++ b/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/netcon_entrypoint.sh
@@ -22,15 +22,7 @@ echo '*** ZeroTier Network Containers Test: ' "$test_name"
 chown -R daemon /var/lib/zerotier-one
 chgrp -R daemon /var/lib/zerotier-one
 su daemon -s /bin/bash -c '/zerotier-one -d -U -p9993 >>/tmp/zerotier-one.out 2>&1'
-echo '*** Waiting for initial identity generation...'
-while [ ! -s /var/lib/zerotier-one/identity.secret ]; do
-	sleep 0.2
-done
-echo '*** Waiting for network config...'
 virtip4=""
-while [ ! -s /var/lib/zerotier-one/networks.d/"$nwconf" ]; do
-	sleep 0.2
-done
 while [ -z "$virtip4" ]; do
 	sleep 0.2
 	virtip4=`/zerotier-cli listnetworks | grep -F $nwid | cut -d ' ' -f 9 | sed 's/,/\n/g' | grep -F '.' | cut -d / -f 1`
diff --git a/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/test.sh b/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/test.sh
deleted file mode 100755
index fa8daddd6..000000000
--- a/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/test.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-
-test_name=${PWD##*/}
-echo 'Building dockerfiles for test: ' "$test_name"
-touch "$test_name".name
-
-# Docker won't allow the inclusion of files outside of the build directory
-cp ../../*.conf .
-cp ../../zerotier-one zerotier-one
-cp ../../zerotier-cli zerotier-cli
-cp ../../zerotier-intercept zerotier-intercept
-cp ../../libzerotierintercept.so.1.0 libzerotierintercept.so.1.0
-cp ../../liblwip.so liblwip.so
-cp ../../netcon_identity.public netcon_identity.public
-cp ../../netcon_identity.secret netcon_identity.secret
-cp ../../monitor_identity.public monitor_identity.public
-cp ../../monitor_identity.secret monitor_identity.secret
-
-docker build --tag="$test_name" -f netcon_dockerfile .
-docker build --tag="$test_name"_monitor -f monitor_dockerfile .
-
-rm -f zerotier-one
-rm -f zerotier-cli
-rm -f zerotier-intercept
-rm -f libzerotierintercept.so.1.0
-rm -f liblwip.so
-rm -f netcon_identity.public
-rm -f netcon_identity.secret
-rm -f monitor_identity.public
-rm -f monitor_identity.secret
-rm -f *.conf
-rm -f *.name
-
-# Start netcon container to be tested
-docker run -d -it -v $PWD/../../_results:/opt/results --device=/dev/net/tun "$test_name":latest
-docker run -d -it -v $PWD/../../_results:/opt/results --device=/dev/net/tun "$test_name"_monitor:latest
-
-sleep 45s
-docker kill $(docker ps -a -q)
-
-rm -rf ../../_results/*.tmp
\ No newline at end of file
diff --git a/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/monitor_dockerfile b/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/monitor_dockerfile
index 08f08ae11..e8f803cde 100644
--- a/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/monitor_dockerfile
+++ b/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/monitor_dockerfile
@@ -4,6 +4,9 @@ MAINTAINER https://www.zerotier.com/
 
 EXPOSE 9993/udp
 
+# Install LWIP library used by service
+ADD liblwip.so /var/lib/zerotier-one/liblwip.so
+
 # Add ZT files
 RUN mkdir -p /var/lib/zerotier-one/networks.d
 ADD monitor_identity.public /var/lib/zerotier-one/identity.public
@@ -14,11 +17,6 @@ ADD *.name /
 ADD zerotier-one /
 ADD zerotier-cli /
 
-# Install LWIP library used by service
-ADD liblwip.so /
-RUN mkdir -p ext/bin/lwip
-RUN cp liblwip.so ext/bin/lwip/liblwip.so
-
 # Start ZeroTier-One
 ADD monitor_entrypoint.sh /monitor_entrypoint.sh
 RUN chmod -v +x /monitor_entrypoint.sh
diff --git a/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/monitor_entrypoint.sh b/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/monitor_entrypoint.sh
index 79d4391d8..9e8f72530 100644
--- a/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/monitor_entrypoint.sh
+++ b/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/monitor_entrypoint.sh
@@ -26,15 +26,7 @@ echo '*** ZeroTier Network Containers Test Monitor'
 chown -R daemon /var/lib/zerotier-one
 chgrp -R daemon /var/lib/zerotier-one
 su daemon -s /bin/bash -c '/zerotier-one -d -U -p9993 >>/tmp/zerotier-one.out 2>&1'
-echo '*** Waiting for initial identity generation...'
-while [ ! -s /var/lib/zerotier-one/identity.secret ]; do
-	sleep 0.2
-done
-echo '*** Waiting for network config...'
 virtip4=""
-while [ ! -s /var/lib/zerotier-one/networks.d/"$nwconf" ]; do
-	sleep 0.2
-done
 while [ -z "$virtip4" ]; do
 	sleep 0.2
 	virtip4=`/zerotier-cli listnetworks | grep -F $nwid | cut -d ' ' -f 9 | sed 's/,/\n/g' | grep -F '.' | cut -d / -f 1`
@@ -63,7 +55,7 @@ tx_md5sum=$(<$tx_md5sumfile)
 
 echo '*** Comparing md5: ' "$rx_md5sum" ' and ' "$tx_md5sum"
 
-if [ $rx_md5sum != $tx_md5sum ]; 
+if [ "$rx_md5sum" != "$tx_md5sum" ]; 
 then
 	echo 'MD5 FAIL'
 	touch "$file_path$fail$test_name.txt"
@@ -72,6 +64,8 @@ else
 	echo 'MD5 OK'
 	touch "$file_path$ok$test_name.txt"
 	printf 'Test: md5 sum ok!\n' >> "$file_path$ok$test_name.txt"
+	cat "$rx_md5sumfile" >> "$file_path$ok$test_name.txt"
+	cat "$tx_md5sumfile" >> "$file_path$ok$test_name.txt"
 fi
 
 
diff --git a/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/netcon_dockerfile b/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/netcon_dockerfile
index fcdff1aaf..1888071e7 100644
--- a/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/netcon_dockerfile
+++ b/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/netcon_dockerfile
@@ -7,7 +7,10 @@ RUN yum -y update
 RUN yum -y install nginx-1:1.8.0-14.fc23.x86_64
 RUN yum clean all
 
-EXPOSE 9993/udp
+EXPOSE 9993/udp 80/udp
+
+# Install LWIP library used by service
+ADD liblwip.so /var/lib/zerotier-one/liblwip.so
 
 # Install syscall intercept library
 ADD zerotier-intercept /
@@ -32,10 +35,5 @@ ADD zerotier-cli /
 ADD netcon_entrypoint.sh /netcon_entrypoint.sh
 RUN chmod -v +x /netcon_entrypoint.sh
 
-# Install LWIP library used by service
-ADD liblwip.so /
-RUN mkdir -p ext/bin/lwip
-RUN cp liblwip.so ext/bin/lwip/liblwip.so
-
 # Start ZeroTier-One
 CMD ["./netcon_entrypoint.sh"]
diff --git a/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/netcon_entrypoint.sh b/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/netcon_entrypoint.sh
index 3fd4ff4c0..d11381119 100644
--- a/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/netcon_entrypoint.sh
+++ b/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/netcon_entrypoint.sh
@@ -22,15 +22,7 @@ echo '*** ZeroTier Network Containers Test: ' "$test_name"
 chown -R daemon /var/lib/zerotier-one
 chgrp -R daemon /var/lib/zerotier-one
 su daemon -s /bin/bash -c '/zerotier-one -d -U -p9993 >>/tmp/zerotier-one.out 2>&1'
-echo '*** Waiting for initial identity generation...'
-while [ ! -s /var/lib/zerotier-one/identity.secret ]; do
-	sleep 0.2
-done
-echo '*** Waiting for network config...'
 virtip4=""
-while [ ! -s /var/lib/zerotier-one/networks.d/"$nwconf" ]; do
-	sleep 0.2
-done
 while [ -z "$virtip4" ]; do
 	sleep 0.2
 	virtip4=`/zerotier-cli listnetworks | grep -F $nwid | cut -d ' ' -f 9 | sed 's/,/\n/g' | grep -F '.' | cut -d / -f 1`
diff --git a/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/test.sh b/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/test.sh
deleted file mode 100755
index fa8daddd6..000000000
--- a/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/test.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-
-test_name=${PWD##*/}
-echo 'Building dockerfiles for test: ' "$test_name"
-touch "$test_name".name
-
-# Docker won't allow the inclusion of files outside of the build directory
-cp ../../*.conf .
-cp ../../zerotier-one zerotier-one
-cp ../../zerotier-cli zerotier-cli
-cp ../../zerotier-intercept zerotier-intercept
-cp ../../libzerotierintercept.so.1.0 libzerotierintercept.so.1.0
-cp ../../liblwip.so liblwip.so
-cp ../../netcon_identity.public netcon_identity.public
-cp ../../netcon_identity.secret netcon_identity.secret
-cp ../../monitor_identity.public monitor_identity.public
-cp ../../monitor_identity.secret monitor_identity.secret
-
-docker build --tag="$test_name" -f netcon_dockerfile .
-docker build --tag="$test_name"_monitor -f monitor_dockerfile .
-
-rm -f zerotier-one
-rm -f zerotier-cli
-rm -f zerotier-intercept
-rm -f libzerotierintercept.so.1.0
-rm -f liblwip.so
-rm -f netcon_identity.public
-rm -f netcon_identity.secret
-rm -f monitor_identity.public
-rm -f monitor_identity.secret
-rm -f *.conf
-rm -f *.name
-
-# Start netcon container to be tested
-docker run -d -it -v $PWD/../../_results:/opt/results --device=/dev/net/tun "$test_name":latest
-docker run -d -it -v $PWD/../../_results:/opt/results --device=/dev/net/tun "$test_name"_monitor:latest
-
-sleep 45s
-docker kill $(docker ps -a -q)
-
-rm -rf ../../_results/*.tmp
\ No newline at end of file
diff --git a/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/monitor_dockerfile b/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/monitor_dockerfile
index 08f08ae11..e8f803cde 100644
--- a/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/monitor_dockerfile
+++ b/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/monitor_dockerfile
@@ -4,6 +4,9 @@ MAINTAINER https://www.zerotier.com/
 
 EXPOSE 9993/udp
 
+# Install LWIP library used by service
+ADD liblwip.so /var/lib/zerotier-one/liblwip.so
+
 # Add ZT files
 RUN mkdir -p /var/lib/zerotier-one/networks.d
 ADD monitor_identity.public /var/lib/zerotier-one/identity.public
@@ -14,11 +17,6 @@ ADD *.name /
 ADD zerotier-one /
 ADD zerotier-cli /
 
-# Install LWIP library used by service
-ADD liblwip.so /
-RUN mkdir -p ext/bin/lwip
-RUN cp liblwip.so ext/bin/lwip/liblwip.so
-
 # Start ZeroTier-One
 ADD monitor_entrypoint.sh /monitor_entrypoint.sh
 RUN chmod -v +x /monitor_entrypoint.sh
diff --git a/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/monitor_entrypoint.sh b/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/monitor_entrypoint.sh
index 0170ae00c..1701a467b 100644
--- a/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/monitor_entrypoint.sh
+++ b/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/monitor_entrypoint.sh
@@ -23,15 +23,7 @@ echo '*** ZeroTier Network Containers Test Monitor'
 chown -R daemon /var/lib/zerotier-one
 chgrp -R daemon /var/lib/zerotier-one
 su daemon -s /bin/bash -c '/zerotier-one -d -U -p9993 >>/tmp/zerotier-one.out 2>&1'
-echo '*** Waiting for initial identity generation...'
-while [ ! -s /var/lib/zerotier-one/identity.secret ]; do
-	sleep 0.2
-done
-echo '*** Waiting for network config...'
 virtip4=""
-while [ ! -s /var/lib/zerotier-one/networks.d/"$nwconf" ]; do
-	sleep 0.2
-done
 while [ -z "$virtip4" ]; do
 	sleep 0.2
 	virtip4=`/zerotier-cli listnetworks | grep -F $nwid | cut -d ' ' -f 9 | sed 's/,/\n/g' | grep -F '.' | cut -d / -f 1`
diff --git a/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/netcon_dockerfile b/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/netcon_dockerfile
index d0ce01de1..ea2abd685 100644
--- a/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/netcon_dockerfile
+++ b/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/netcon_dockerfile
@@ -9,6 +9,9 @@ RUN yum clean all
 
 EXPOSE 9993/udp 8080/udp
 
+# Install LWIP library used by service
+ADD liblwip.so /var/lib/zerotier-one/liblwip.so
+
 # 
 ADD httpserver.js /
 
@@ -35,10 +38,5 @@ ADD zerotier-cli /
 ADD netcon_entrypoint.sh /netcon_entrypoint.sh
 RUN chmod -v +x /netcon_entrypoint.sh
 
-# Install LWIP library used by service
-ADD liblwip.so /
-RUN mkdir -p ext/bin/lwip
-RUN cp liblwip.so ext/bin/lwip/liblwip.so
-
 # Start ZeroTier-One
 CMD ["./netcon_entrypoint.sh"]
diff --git a/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/netcon_entrypoint.sh b/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/netcon_entrypoint.sh
index d18f3e1ce..a6aadb9f1 100644
--- a/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/netcon_entrypoint.sh
+++ b/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/netcon_entrypoint.sh
@@ -19,15 +19,7 @@ echo '*** ZeroTier Network Containers Test: ' "$test_name"
 chown -R daemon /var/lib/zerotier-one
 chgrp -R daemon /var/lib/zerotier-one
 su daemon -s /bin/bash -c '/zerotier-one -d -U -p9993 >>/tmp/zerotier-one.out 2>&1'
-echo '*** Waiting for initial identity generation...'
-while [ ! -s /var/lib/zerotier-one/identity.secret ]; do
-	sleep 0.2
-done
-echo '*** Waiting for network config...'
 virtip4=""
-while [ ! -s /var/lib/zerotier-one/networks.d/"$nwconf" ]; do
-	sleep 0.2
-done
 while [ -z "$virtip4" ]; do
 	sleep 0.2
 	virtip4=`/zerotier-cli listnetworks | grep -F $nwid | cut -d ' ' -f 9 | sed 's/,/\n/g' | grep -F '.' | cut -d / -f 1`
diff --git a/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/test.sh b/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/test.sh
deleted file mode 100755
index fa8daddd6..000000000
--- a/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/test.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-
-test_name=${PWD##*/}
-echo 'Building dockerfiles for test: ' "$test_name"
-touch "$test_name".name
-
-# Docker won't allow the inclusion of files outside of the build directory
-cp ../../*.conf .
-cp ../../zerotier-one zerotier-one
-cp ../../zerotier-cli zerotier-cli
-cp ../../zerotier-intercept zerotier-intercept
-cp ../../libzerotierintercept.so.1.0 libzerotierintercept.so.1.0
-cp ../../liblwip.so liblwip.so
-cp ../../netcon_identity.public netcon_identity.public
-cp ../../netcon_identity.secret netcon_identity.secret
-cp ../../monitor_identity.public monitor_identity.public
-cp ../../monitor_identity.secret monitor_identity.secret
-
-docker build --tag="$test_name" -f netcon_dockerfile .
-docker build --tag="$test_name"_monitor -f monitor_dockerfile .
-
-rm -f zerotier-one
-rm -f zerotier-cli
-rm -f zerotier-intercept
-rm -f libzerotierintercept.so.1.0
-rm -f liblwip.so
-rm -f netcon_identity.public
-rm -f netcon_identity.secret
-rm -f monitor_identity.public
-rm -f monitor_identity.secret
-rm -f *.conf
-rm -f *.name
-
-# Start netcon container to be tested
-docker run -d -it -v $PWD/../../_results:/opt/results --device=/dev/net/tun "$test_name":latest
-docker run -d -it -v $PWD/../../_results:/opt/results --device=/dev/net/tun "$test_name"_monitor:latest
-
-sleep 45s
-docker kill $(docker ps -a -q)
-
-rm -rf ../../_results/*.tmp
\ No newline at end of file
diff --git a/netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/monitor_dockerfile b/netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/monitor_dockerfile
index 56e65dba7..cbba716b4 100644
--- a/netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/monitor_dockerfile
+++ b/netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/monitor_dockerfile
@@ -6,6 +6,9 @@ RUN yum -y install redis-3.0.4-1.fc23.x86_64
 
 EXPOSE 9993/udp
 
+# Install LWIP library used by service
+ADD liblwip.so /var/lib/zerotier-one/liblwip.so
+
 ADD hello.lua /
 
 # Add ZT files
@@ -18,11 +21,6 @@ ADD *.name /
 ADD zerotier-one /
 ADD zerotier-cli /
 
-# Install LWIP library used by service
-ADD liblwip.so /
-RUN mkdir -p ext/bin/lwip
-RUN cp liblwip.so ext/bin/lwip/liblwip.so
-
 # Start ZeroTier-One
 ADD monitor_entrypoint.sh /monitor_entrypoint.sh
 RUN chmod -v +x /monitor_entrypoint.sh
diff --git a/netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/monitor_entrypoint.sh b/netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/monitor_entrypoint.sh
index 69d9d5950..087f50bbe 100644
--- a/netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/monitor_entrypoint.sh
+++ b/netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/monitor_entrypoint.sh
@@ -23,15 +23,7 @@ echo '*** ZeroTier Network Containers Test Monitor'
 chown -R daemon /var/lib/zerotier-one
 chgrp -R daemon /var/lib/zerotier-one
 su daemon -s /bin/bash -c '/zerotier-one -d -U -p9993 >>/tmp/zerotier-one.out 2>&1'
-echo '*** Waiting for initial identity generation...'
-while [ ! -s /var/lib/zerotier-one/identity.secret ]; do
-	sleep 0.2
-done
-echo '*** Waiting for network config...'
 virtip4=""
-while [ ! -s /var/lib/zerotier-one/networks.d/"$nwconf" ]; do
-	sleep 0.2
-done
 while [ -z "$virtip4" ]; do
 	sleep 0.2
 	virtip4=`/zerotier-cli listnetworks | grep -F $nwid | cut -d ' ' -f 9 | sed 's/,/\n/g' | grep -F '.' | cut -d / -f 1`
diff --git a/netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/netcon_dockerfile b/netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/netcon_dockerfile
index 4ce783463..e2eed9fa8 100644
--- a/netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/netcon_dockerfile
+++ b/netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/netcon_dockerfile
@@ -9,6 +9,9 @@ RUN yum clean all
 
 EXPOSE 9993/udp 6379/udp
 
+# Install LWIP library used by service
+ADD liblwip.so /var/lib/zerotier-one/liblwip.so
+
 # Install syscall intercept library
 ADD zerotier-intercept /
 ADD libzerotierintercept.so.1.0 /
@@ -32,10 +35,5 @@ ADD zerotier-cli /
 ADD netcon_entrypoint.sh /netcon_entrypoint.sh
 RUN chmod -v +x /netcon_entrypoint.sh
 
-# Install LWIP library used by service
-ADD liblwip.so /
-RUN mkdir -p ext/bin/lwip
-RUN cp liblwip.so ext/bin/lwip/liblwip.so
-
 # Start ZeroTier-One
 CMD ["./netcon_entrypoint.sh"]
diff --git a/netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/netcon_entrypoint.sh b/netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/netcon_entrypoint.sh
index 185813f35..ff5b4259f 100644
--- a/netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/netcon_entrypoint.sh
+++ b/netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/netcon_entrypoint.sh
@@ -19,15 +19,7 @@ echo '*** ZeroTier Network Containers Test: ' "$test_name"
 chown -R daemon /var/lib/zerotier-one
 chgrp -R daemon /var/lib/zerotier-one
 su daemon -s /bin/bash -c '/zerotier-one -d -U -p9993 >>/tmp/zerotier-one.out 2>&1'
-echo '*** Waiting for initial identity generation...'
-while [ ! -s /var/lib/zerotier-one/identity.secret ]; do
-	sleep 0.2
-done
-echo '*** Waiting for network config...'
 virtip4=""
-while [ ! -s /var/lib/zerotier-one/networks.d/"$nwconf" ]; do
-	sleep 0.2
-done
 while [ -z "$virtip4" ]; do
 	sleep 0.2
 	virtip4=`/zerotier-cli listnetworks | grep -F $nwid | cut -d ' ' -f 9 | sed 's/,/\n/g' | grep -F '.' | cut -d / -f 1`
diff --git a/netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/test.sh b/netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/test.sh
deleted file mode 100755
index fa8daddd6..000000000
--- a/netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/test.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-
-test_name=${PWD##*/}
-echo 'Building dockerfiles for test: ' "$test_name"
-touch "$test_name".name
-
-# Docker won't allow the inclusion of files outside of the build directory
-cp ../../*.conf .
-cp ../../zerotier-one zerotier-one
-cp ../../zerotier-cli zerotier-cli
-cp ../../zerotier-intercept zerotier-intercept
-cp ../../libzerotierintercept.so.1.0 libzerotierintercept.so.1.0
-cp ../../liblwip.so liblwip.so
-cp ../../netcon_identity.public netcon_identity.public
-cp ../../netcon_identity.secret netcon_identity.secret
-cp ../../monitor_identity.public monitor_identity.public
-cp ../../monitor_identity.secret monitor_identity.secret
-
-docker build --tag="$test_name" -f netcon_dockerfile .
-docker build --tag="$test_name"_monitor -f monitor_dockerfile .
-
-rm -f zerotier-one
-rm -f zerotier-cli
-rm -f zerotier-intercept
-rm -f libzerotierintercept.so.1.0
-rm -f liblwip.so
-rm -f netcon_identity.public
-rm -f netcon_identity.secret
-rm -f monitor_identity.public
-rm -f monitor_identity.secret
-rm -f *.conf
-rm -f *.name
-
-# Start netcon container to be tested
-docker run -d -it -v $PWD/../../_results:/opt/results --device=/dev/net/tun "$test_name":latest
-docker run -d -it -v $PWD/../../_results:/opt/results --device=/dev/net/tun "$test_name"_monitor:latest
-
-sleep 45s
-docker kill $(docker ps -a -q)
-
-rm -rf ../../_results/*.tmp
\ No newline at end of file
diff --git a/netcon/docker-test/sshd/ openssh-server-7.1p1-3.fc23.x86_64/test.sh b/netcon/docker-test/sshd/ openssh-server-7.1p1-3.fc23.x86_64/test.sh
deleted file mode 100755
index fa8daddd6..000000000
--- a/netcon/docker-test/sshd/ openssh-server-7.1p1-3.fc23.x86_64/test.sh	
+++ /dev/null
@@ -1,40 +0,0 @@
-
-test_name=${PWD##*/}
-echo 'Building dockerfiles for test: ' "$test_name"
-touch "$test_name".name
-
-# Docker won't allow the inclusion of files outside of the build directory
-cp ../../*.conf .
-cp ../../zerotier-one zerotier-one
-cp ../../zerotier-cli zerotier-cli
-cp ../../zerotier-intercept zerotier-intercept
-cp ../../libzerotierintercept.so.1.0 libzerotierintercept.so.1.0
-cp ../../liblwip.so liblwip.so
-cp ../../netcon_identity.public netcon_identity.public
-cp ../../netcon_identity.secret netcon_identity.secret
-cp ../../monitor_identity.public monitor_identity.public
-cp ../../monitor_identity.secret monitor_identity.secret
-
-docker build --tag="$test_name" -f netcon_dockerfile .
-docker build --tag="$test_name"_monitor -f monitor_dockerfile .
-
-rm -f zerotier-one
-rm -f zerotier-cli
-rm -f zerotier-intercept
-rm -f libzerotierintercept.so.1.0
-rm -f liblwip.so
-rm -f netcon_identity.public
-rm -f netcon_identity.secret
-rm -f monitor_identity.public
-rm -f monitor_identity.secret
-rm -f *.conf
-rm -f *.name
-
-# Start netcon container to be tested
-docker run -d -it -v $PWD/../../_results:/opt/results --device=/dev/net/tun "$test_name":latest
-docker run -d -it -v $PWD/../../_results:/opt/results --device=/dev/net/tun "$test_name"_monitor:latest
-
-sleep 45s
-docker kill $(docker ps -a -q)
-
-rm -rf ../../_results/*.tmp
\ No newline at end of file
diff --git a/netcon/docker-test/sshd/ openssh-server-7.1p1-3.fc23.x86_64/monitor_dockerfile b/netcon/docker-test/sshd/openssh-server-7.1p1-3.fc23.x86_64/monitor_dockerfile
similarity index 87%
rename from netcon/docker-test/sshd/ openssh-server-7.1p1-3.fc23.x86_64/monitor_dockerfile
rename to netcon/docker-test/sshd/openssh-server-7.1p1-3.fc23.x86_64/monitor_dockerfile
index 08f08ae11..e8f803cde 100644
--- a/netcon/docker-test/sshd/ openssh-server-7.1p1-3.fc23.x86_64/monitor_dockerfile	
+++ b/netcon/docker-test/sshd/openssh-server-7.1p1-3.fc23.x86_64/monitor_dockerfile
@@ -4,6 +4,9 @@ MAINTAINER https://www.zerotier.com/
 
 EXPOSE 9993/udp
 
+# Install LWIP library used by service
+ADD liblwip.so /var/lib/zerotier-one/liblwip.so
+
 # Add ZT files
 RUN mkdir -p /var/lib/zerotier-one/networks.d
 ADD monitor_identity.public /var/lib/zerotier-one/identity.public
@@ -14,11 +17,6 @@ ADD *.name /
 ADD zerotier-one /
 ADD zerotier-cli /
 
-# Install LWIP library used by service
-ADD liblwip.so /
-RUN mkdir -p ext/bin/lwip
-RUN cp liblwip.so ext/bin/lwip/liblwip.so
-
 # Start ZeroTier-One
 ADD monitor_entrypoint.sh /monitor_entrypoint.sh
 RUN chmod -v +x /monitor_entrypoint.sh
diff --git a/netcon/docker-test/sshd/ openssh-server-7.1p1-3.fc23.x86_64/monitor_entrypoint.sh b/netcon/docker-test/sshd/openssh-server-7.1p1-3.fc23.x86_64/monitor_entrypoint.sh
similarity index 88%
rename from netcon/docker-test/sshd/ openssh-server-7.1p1-3.fc23.x86_64/monitor_entrypoint.sh
rename to netcon/docker-test/sshd/openssh-server-7.1p1-3.fc23.x86_64/monitor_entrypoint.sh
index ec3dd7fac..d617bd4a1 100644
--- a/netcon/docker-test/sshd/ openssh-server-7.1p1-3.fc23.x86_64/monitor_entrypoint.sh	
+++ b/netcon/docker-test/sshd/openssh-server-7.1p1-3.fc23.x86_64/monitor_entrypoint.sh
@@ -26,15 +26,7 @@ echo '*** ZeroTier Network Containers Test Monitor'
 chown -R daemon /var/lib/zerotier-one
 chgrp -R daemon /var/lib/zerotier-one
 su daemon -s /bin/bash -c '/zerotier-one -d -U -p9993 >>/tmp/zerotier-one.out 2>&1'
-echo '*** Waiting for initial identity generation...'
-while [ ! -s /var/lib/zerotier-one/identity.secret ]; do
-	sleep 0.2
-done
-echo '*** Waiting for network config...'
 virtip4=""
-while [ ! -s /var/lib/zerotier-one/networks.d/"$nwconf" ]; do
-	sleep 0.2
-done
 while [ -z "$virtip4" ]; do
 	sleep 0.2
 	virtip4=`/zerotier-cli listnetworks | grep -F $nwid | cut -d ' ' -f 9 | sed 's/,/\n/g' | grep -F '.' | cut -d / -f 1`
diff --git a/netcon/docker-test/sshd/ openssh-server-7.1p1-3.fc23.x86_64/netcon_dockerfile b/netcon/docker-test/sshd/openssh-server-7.1p1-3.fc23.x86_64/netcon_dockerfile
similarity index 92%
rename from netcon/docker-test/sshd/ openssh-server-7.1p1-3.fc23.x86_64/netcon_dockerfile
rename to netcon/docker-test/sshd/openssh-server-7.1p1-3.fc23.x86_64/netcon_dockerfile
index 95088b535..ddb0a6c40 100644
--- a/netcon/docker-test/sshd/ openssh-server-7.1p1-3.fc23.x86_64/netcon_dockerfile	
+++ b/netcon/docker-test/sshd/openssh-server-7.1p1-3.fc23.x86_64/netcon_dockerfile
@@ -9,6 +9,9 @@ RUN yum clean all
 
 EXPOSE 9993/udp
 
+# Install LWIP library used by service
+ADD liblwip.so /var/lib/zerotier-one/liblwip.so
+
 # Install syscall intercept library
 ADD zerotier-intercept /
 ADD libzerotierintercept.so.1.0 /
@@ -32,10 +35,5 @@ ADD zerotier-cli /
 ADD netcon_entrypoint.sh /netcon_entrypoint.sh
 RUN chmod -v +x /netcon_entrypoint.sh
 
-# Install LWIP library used by service
-ADD liblwip.so /
-RUN mkdir -p ext/bin/lwip
-RUN cp liblwip.so ext/bin/lwip/liblwip.so
-
 # Start ZeroTier-One
 CMD ["./netcon_entrypoint.sh"]
diff --git a/netcon/docker-test/sshd/ openssh-server-7.1p1-3.fc23.x86_64/netcon_entrypoint.sh b/netcon/docker-test/sshd/openssh-server-7.1p1-3.fc23.x86_64/netcon_entrypoint.sh
similarity index 84%
rename from netcon/docker-test/sshd/ openssh-server-7.1p1-3.fc23.x86_64/netcon_entrypoint.sh
rename to netcon/docker-test/sshd/openssh-server-7.1p1-3.fc23.x86_64/netcon_entrypoint.sh
index 10a08eb2e..a8784d5c1 100644
--- a/netcon/docker-test/sshd/ openssh-server-7.1p1-3.fc23.x86_64/netcon_entrypoint.sh	
+++ b/netcon/docker-test/sshd/openssh-server-7.1p1-3.fc23.x86_64/netcon_entrypoint.sh
@@ -21,16 +21,8 @@ tx_md5sumfile="$file_path"tx_"$bigfile_name"_md5sum"$tmp_ext"
 echo '*** ZeroTier Network Containers Test: ' "$test_name"
 chown -R daemon /var/lib/zerotier-one
 chgrp -R daemon /var/lib/zerotier-one
-su daemon -s /bin/bash -c '/zerotier-one -d -U -p9993 >>/tmp/zerotier-one.out 2>&1'
-echo '*** Waiting for initial identity generation...'
-while [ ! -s /var/lib/zerotier-one/identity.secret ]; do
-	sleep 0.2
-done
-echo '*** Waiting for network config...'
+./zerotier-one -d -U -p9993
 virtip4=""
-while [ ! -s /var/lib/zerotier-one/networks.d/"$nwconf" ]; do
-	sleep 0.2
-done
 while [ -z "$virtip4" ]; do
 	sleep 0.2
 	virtip4=`/zerotier-cli listnetworks | grep -F $nwid | cut -d ' ' -f 9 | sed 's/,/\n/g' | grep -F '.' | cut -d / -f 1`
diff --git a/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/test.sh b/netcon/docker-test/sshd/openssh-server-7.1p1-3.fc23.x86_64/two_party_test.sh
similarity index 73%
rename from netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/test.sh
rename to netcon/docker-test/sshd/openssh-server-7.1p1-3.fc23.x86_64/two_party_test.sh
index fa8daddd6..b054b34b7 100755
--- a/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/test.sh
+++ b/netcon/docker-test/sshd/openssh-server-7.1p1-3.fc23.x86_64/two_party_test.sh
@@ -31,10 +31,11 @@ rm -f *.conf
 rm -f *.name
 
 # Start netcon container to be tested
-docker run -d -it -v $PWD/../../_results:/opt/results --device=/dev/net/tun "$test_name":latest
-docker run -d -it -v $PWD/../../_results:/opt/results --device=/dev/net/tun "$test_name"_monitor:latest
+test_container=$(docker run -d -it -v $PWD/../../_results:/opt/results --device=/dev/net/tun "$test_name":latest)
+monitor_container=$(docker run -d -it -v $PWD/../../_results:/opt/results --device=/dev/net/tun "$test_name"_monitor:latest)
 
-sleep 45s
+echo "waiting $netcon_test_wait_time for test to complete."
+sleep $netcon_test_wait_time
 docker kill $(docker ps -a -q)
-
-rm -rf ../../_results/*.tmp
\ No newline at end of file
+docker rm $test_container
+docker rm $monitor_container
\ No newline at end of file
diff --git a/netcon/docker-test/test.sh b/netcon/docker-test/test.sh
index 6f69e3bfb..9f232ca8a 100755
--- a/netcon/docker-test/test.sh
+++ b/netcon/docker-test/test.sh
@@ -1,42 +1,21 @@
 #./build.sh
 
-# Relative paths are used in each test script, hence the need to change directories
+# Remove previous test results
+rm _results/*.txt 
 
-# --- httpd
-cd httpd
+# How long we shall wait for each test to conclude
+export netcon_test_wait_time=45s
 
-cd httpd-2.4.16-1.fc23.x86_64
-./test.sh
-cd ..
+# Test structure, in later releases more complex multi-party scripts will be included
+export testscript=two_party_test.sh
 
-cd httpd-2.4.17-3.fc23.x86_64
-./test.sh
-cd ../../
-
-
-# --- nginx
-cd nginx
-
-cd nginx-1.8.0-13.fc23.x86_64
-./test.sh
-cd ..
-
-cd nginx-1.8.0-14.fc23.x86_64
-./test.sh
-cd ../../
-
-
-# --- redis
-cd redis
-
-cd redis-3.0.4-1.fc23.x86_64
-./test.sh
-cd ../../
-
-
-# --- node.js
-cd nodejs
-
-cd nodejs-0.10.36-4.fc23
-./test.sh
-cd ../../
\ No newline at end of file
+# Iterate over all depth=2 (relatively-speaking) directories and perform each test
+find . -mindepth 2 -maxdepth 2 -type d | while read testdir; do
+    echo "*** Testing: '$testdir'..."
+    rm _results/*.tmp
+    cp $testscript $testdir/$testscript
+    cd $testdir
+    ./$testscript
+    rm $testscript
+    cd ../../
+done
\ No newline at end of file
diff --git a/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/test.sh b/netcon/docker-test/two_party_test.sh
similarity index 73%
rename from netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/test.sh
rename to netcon/docker-test/two_party_test.sh
index fa8daddd6..b054b34b7 100755
--- a/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/test.sh
+++ b/netcon/docker-test/two_party_test.sh
@@ -31,10 +31,11 @@ rm -f *.conf
 rm -f *.name
 
 # Start netcon container to be tested
-docker run -d -it -v $PWD/../../_results:/opt/results --device=/dev/net/tun "$test_name":latest
-docker run -d -it -v $PWD/../../_results:/opt/results --device=/dev/net/tun "$test_name"_monitor:latest
+test_container=$(docker run -d -it -v $PWD/../../_results:/opt/results --device=/dev/net/tun "$test_name":latest)
+monitor_container=$(docker run -d -it -v $PWD/../../_results:/opt/results --device=/dev/net/tun "$test_name"_monitor:latest)
 
-sleep 45s
+echo "waiting $netcon_test_wait_time for test to complete."
+sleep $netcon_test_wait_time
 docker kill $(docker ps -a -q)
-
-rm -rf ../../_results/*.tmp
\ No newline at end of file
+docker rm $test_container
+docker rm $monitor_container
\ No newline at end of file