diff --git a/.dev-tools/test-blocker-whitelist.sh b/.dev-tools/test-blocker-whitelist.sh
index 3a68cd5f2..dd41f6297 100755
--- a/.dev-tools/test-blocker-whitelist.sh
+++ b/.dev-tools/test-blocker-whitelist.sh
@@ -19,9 +19,9 @@
 echo "Whitelist Tests Starting"
 
 echo "Activating Users User-Agents Whitelist/Blacklist"
-sudo cp ${TRAVIS_BUILD_DIR}/.dev-tools/blacklist-user-agents.conf /etc/nginx/bots.d/blacklist-user-agents.conf
+sudo cp ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/blacklist-user-agents.conf /etc/nginx/bots.d/blacklist-user-agents.conf
 echo "Activating Users Referrers Whitelist/Blacklist"
-sudo cp ${TRAVIS_BUILD_DIR}/.dev-tools/custom-bad-referrers.conf /etc/nginx/bots.d/custom-bad-referrers.conf
+sudo cp ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/custom-bad-referrers.conf /etc/nginx/bots.d/custom-bad-referrers.conf
 echo "Reloading Nginx"
 sudo nginx -t && sudo nginx -s reload
 
diff --git a/.dev-tools/test-blocker.sh b/.dev-tools/test-blocker.sh
index 6c5b44a04..42130f78a 100755
--- a/.dev-tools/test-blocker.sh
+++ b/.dev-tools/test-blocker.sh
@@ -22,11 +22,13 @@
 
 echo "Tests Starting"
 
-echo "Set Whitelisting to Default"
-#sudo cp ${TRAVIS_BUILD_DIR}/.dev-tools/blacklist-user-agents-none.conf /etc/nginx/bots.d/blacklist-user-agents.conf
+echo "Disable any User Whitelisting and set to Default"
+sudo cp ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/blacklist-user-agents-none.conf /etc/nginx/bots.d/blacklist-user-agents.conf
 echo "Reloading Nginx"
-#sudo nginx -t && sudo nginx -s reload
+sudo nginx -t && sudo nginx -s reload
 
+echo "Sleeping for 30 seconds to allow Nginx Properly Reload inside Travis"
+sleep 30s
 
 # *************************************************
 # Function Curl Test 1 - Check for Bad Bot "80legs"
@@ -361,6 +363,24 @@ for line in ${lines}; do
 done
 IFS=""
 
+# **************************
+# Test Good Referrer Domains
+# **************************
+
+echo "Testing Good Referrers"
+IFS=$'\n'
+file=${TRAVIS_BUILD_DIR}/.dev-tools/test_units/good-referrers-for-test.list
+lines=$(cat ${file})
+for line in ${lines}; do
+   if
+   curl -v -A "${line}" http://localhost:9000 2>&1 | grep -i 'Welcome'; then
+   echo "${bold}${green}PASSED - ${green}${line} was ALLOWED"
+   else
+   echo "${bold}${green}FAILED - ${red}${line} was BLOCKED"
+   fi
+done
+IFS=""
+
 
 echo "Tests Completed"
 
diff --git a/.dev-tools/blacklist-user-agents-none.conf b/.dev-tools/test_units/blacklist-user-agents-none.conf
similarity index 100%
rename from .dev-tools/blacklist-user-agents-none.conf
rename to .dev-tools/test_units/blacklist-user-agents-none.conf
diff --git a/.dev-tools/blacklist-user-agents.conf b/.dev-tools/test_units/blacklist-user-agents.conf
similarity index 100%
rename from .dev-tools/blacklist-user-agents.conf
rename to .dev-tools/test_units/blacklist-user-agents.conf
diff --git a/.dev-tools/custom-bad-referrers.conf b/.dev-tools/test_units/custom-bad-referrers.conf
similarity index 100%
rename from .dev-tools/custom-bad-referrers.conf
rename to .dev-tools/test_units/custom-bad-referrers.conf
diff --git a/.dev-tools/test_units/good-referrers-for-test.list b/.dev-tools/test_units/good-referrers-for-test.list
new file mode 100644
index 000000000..71c9d8754
--- /dev/null
+++ b/.dev-tools/test_units/good-referrers-for-test.list
@@ -0,0 +1,16 @@
+-
+--
+bing.com
+bit.ly
+google.com
+is.gd
+l.facebook.com
+m.facebook.com
+t.co
+www.bing.com
+www.google.ae
+www.google.com
+www.google.com.ar
+www.google.com.ph
+www.google.lt
+www.google.pt