diff --git a/.dev-tools/generate-files.sh b/.dev-tools/generate-files.sh
index e4d626b48..6f5b18d82 100755
--- a/.dev-tools/generate-files.sh
+++ b/.dev-tools/generate-files.sh
@@ -53,8 +53,7 @@ sudo chmod +x ${TRAVIS_BUILD_DIR}/.dev-tools/generate-google-exclude.php
 sudo chmod +x ${TRAVIS_BUILD_DIR}/.dev-tools/generate-regex-format-referrers.php
 sudo chmod +x ${TRAVIS_BUILD_DIR}/.dev-tools/modify-config-readme-files.sh
 sudo chmod +x ${TRAVIS_BUILD_DIR}/.dev-tools/modify-files-and-commit.sh
-sudo chmod +x ${TRAVIS_BUILD_DIR}/.dev-tools/run-curl-tests.sh
-sudo chmod +x ${TRAVIS_BUILD_DIR}/.dev-tools/run-curl-tests-testing-of-changes.sh
+sudo chmod +x ${TRAVIS_BUILD_DIR}/.dev-tools/test-blocker.sh
 sudo chmod +x ${TRAVIS_BUILD_DIR}/.dev-tools/prepare-robots-input.sh
 sudo chmod +x ${TRAVIS_BUILD_DIR}/.dev-tools/install-nginx-1.sh
 sudo chmod +x ${TRAVIS_BUILD_DIR}/.dev-tools/install-nginx-2.sh
diff --git a/.dev-tools/run-curl-tests.sh b/.dev-tools/run-curl-tests.sh
deleted file mode 100755
index 91532c2ac..000000000
--- a/.dev-tools/run-curl-tests.sh
+++ /dev/null
@@ -1,257 +0,0 @@
-#!/bin/bash
-# Curl Testing Script for Nginx Ultimate Bad Bot Blocker
-# Created by: Mitchell Krog (mitchellkrog@gmail.com)
-# Copyright: Mitchell Krog - https://github.com/mitchellkrogza
-# Repo Url: https://github.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker
-
-##############################################################################                                                                
-#       _  __     _                                                          #
-#      / |/ /__ _(_)__ __ __                                                 #
-#     /    / _ `/ / _ \\ \ /                                                 #
-#    /_/|_/\_, /_/_//_/_\_\                                                  #
-#       __/___/      __   ___       __     ___  __         __                #
-#      / _ )___ ____/ /  / _ )___  / /_   / _ )/ /__  ____/ /_____ ____      #
-#     / _  / _ `/ _  /  / _  / _ \/ __/  / _  / / _ \/ __/  '_/ -_) __/      #
-#    /____/\_,_/\_,_/  /____/\___/\__/  /____/_/\___/\__/_/\_\\__/_/         #
-#                                                                            #
-##############################################################################                                                                
-
-# *******************************************
-# Set Location of our Curl Test Results Files
-# *******************************************
-
-echo "Tests Starting"
-
-# *************************************************
-# Function Curl Test 1 - Check for Bad Bot "80legs"
-# *************************************************
-
-run_curltest1 () {
-printf '\n%s\n%s\n%s\n\n' "#########################" "TESTING BAD BOT IS DENIED" "#########################"
-if curl -v -A "80legs" http://localhost:9000/index.php 2>&1 | grep -i '(52)'; then
-   echo "$(tput setaf 1)BAD BOT DETECTED - $(tput setaf 2)TEST PASSED"
-else
-   echo "$(tput setaf 1)BAD BOT NOT DETECTED - TEST FAILED"
-fi
-}
-run_curltest1
-
-
-# **************************************************
-# Function Curl Test 2 - Check for Bad Bot "Nutch"
-# **************************************************
-
-run_curltest2 () {
-printf '\n%s\n%s\n%s\n\n' "#########################" "TESTING BAD BOT IS DENIED" "#########################"
-if curl -v -A "Nutch" http://localhost:9000/index.php 2>&1 | grep -i '(52)'; then
-   echo "$(tput setaf 1)BAD BOT DETECTED - $(tput setaf 2)TEST PASSED"
-else
-   echo "$(tput setaf 1)BAD BOT NOT DETECTED - TEST FAILED"
-   #exit 1
-fi
-}
-run_curltest2
-
-
-# ******************************************************************
-# Function Curl Test 3 - Check for Bad Referrer "100dollars-seo.com"
-# ******************************************************************
-
-run_curltest3 () {
-printf '\n%s\n%s\n%s\n\n' "##############################" "TESTING BAD REFERRER IS DENIED" "##############################"
-if curl -I http://localhost:9000/index.php -e http://100dollars-seo.com 2>&1 | grep -i '(52)'; then
-   echo "$(tput setaf 1)BAD REFERRER DETECTED - $(tput setaf 2)TEST PASSED"
-else
-   echo "$(tput setaf 1)BAD REFERRER NOT DETECTED - TEST FAILED"
-   #exit 1
-fi
-}
-run_curltest3
-
-
-# ******************************************************
-# Function Curl Test 4 - Check for Bad Referrer "zx6.ru"
-# ******************************************************
-
-run_curltest4 () {
-printf '\n%s\n%s\n%s\n\n' "##############################" "TESTING BAD REFERRER IS DENIED" "##############################"
-if curl -I http://localhost:9000/index.php -e http://zx6.ru 2>&1 | grep -i '(52)'; then
-   echo "$(tput setaf 1)BAD REFERRER DETECTED - $(tput setaf 2)TEST PASSED"
-else
-   echo "$(tput setaf 1)BAD REFERRER NOT DETECTED - TEST FAILED"
-   #exit 1
-fi
-}
-run_curltest4
-
-# *****************************************************
-# Function Curl Test 5 - Check for Good Bot "GoogleBot"
-# *****************************************************
-
-run_curltest5 () {
-printf '\n%s\n%s\n%s\n\n' "###########################" "TESTING GOOD BOT IS ALLOWED" "###########################"
-if curl -v -A "GoogleBot" http://localhost:9000/index.php 2>&1 | grep -i 'Welcome'; then
-   echo "$(tput setaf 2)GOOD BOT ALLOWED THROUGH - TEST PASSED"
-else
-   echo "$(tput setaf 1)GOOD BOT NOT ALLOWED THROUGH - TEST FAILED"
-   #exit 1
-fi
-}
-run_curltest5
-
-# ***************************************************
-# Function Curl Test 6 - Check for Good Bot "BingBot"
-# ***************************************************
-
-run_curltest6 () {
-printf '\n%s\n%s\n%s\n\n' "###########################" "TESTING GOOD BOT IS ALLOWED" "###########################"
-if curl -v -A "BingBot" http://localhost:9000/index.php 2>&1 | grep -i 'Welcome'; then
-   echo "$(tput setaf 2)GOOD BOT ALLOWED THROUGH - TEST PASSED"
-else
-   echo "$(tput setaf 1)GOOD BOT NOT ALLOWED THROUGH - TEST FAILED"
-   #exit 1
-fi
-}
-run_curltest6
-
-# ***********************************************************
-# Function Curl Test 7 - Check for Good Referrer "google.com"
-# ***********************************************************
-
-run_curltest7 () {
-printf '\n%s\n%s\n%s\n\n' "################################" "TESTING GOOD REFERRER IS ALLOWED" "################################"
-if curl http://localhost:9000/index.php -e http://google.com 2>&1 | grep -i 'Welcome'; then
-   echo "$(tput setaf 2)GOOD REFERRER DETECTED - TEST PASSED"
-else
-   echo "$(tput setaf 1)GOOD REFERRER NOT DETECTED - TEST FAILED"
-   #exit 1
-fi
-}
-run_curltest7
-
-# ***********************************************************
-# Function Curl Test 8 - Check for Good Referrer "bing.com"
-# ***********************************************************
-
-run_curltest8 () {
-printf '\n%s\n%s\n%s\n\n' "################################" "TESTING GOOD REFERRER IS ALLOWED" "################################"
-if curl http://localhost:9000/index.php -e http://bing.com 2>&1 | grep -i 'Welcome'; then
-   echo "$(tput setaf 2)GOOD REFERRER DETECTED - TEST PASSED"
-else
-   echo "$(tput setaf 1)GOOD REFERRER NOT DETECTED - TEST FAILED"
-   #exit 1
-fi
-}
-run_curltest8
-
-# **************************************************
-# Function Curl Test 9 - Check for Bad Bot "Nutch"
-# **************************************************
-
-run_curltest9 () {
-printf '\n%s\n%s\n%s\n\n' "#########################" "TESTING BAD BOT IS DENIED" "#########################"
-if curl -A "Googlebot/Nutch-1.7" http://localhost:9000/index.php 2>&1 | grep -i '(52)'; then
-   echo "$(tput setaf 1)BAD BOT DETECTED - $(tput setaf 2)TEST PASSED"
-else
-   echo "$(tput setaf 1)BAD BOT NOT DETECTED - TEST FAILED"
-   #exit 1
-fi
-}
-run_curltest9
-
-# **************************************************
-# Function Curl Test 10 - Check for Bad Bot "Nutch"
-# **************************************************
-
-run_curltest10 () {
-printf '\n%s\n%s\n%s\n\n' "#########################" "TESTING BAD BOT IS DENIED" "#########################"
-if curl -A "Mozilla/5.0 (compatible; Googlebot/Nutch2.1; +http://www.google.com/bot.html)" http://localhost:9000/index.php 2>&1 | grep -i '(52)'; then
-   echo "$(tput setaf 1)BAD BOT DETECTED - $(tput setaf 2)TEST PASSED"
-else
-   echo "$(tput setaf 1)BAD BOT NOT DETECTED - TEST FAILED"
-   #exit 1
-fi
-}
-run_curltest10
-
-# **************************************************
-# Function Curl Test 11 - Check for Bad Bot "Nutch"
-# **************************************************
-
-run_curltest11 () {
-printf '\n%s\n%s\n%s\n\n' "#########################" "TESTING BAD BOT IS DENIED" "#########################"
-if curl -A "Mozilla/5.0 (compatible; Googlebot/nutch/-2.1; +http://www.google.com/bot.html)" http://localhost:9000/index.php 2>&1 | grep -i '(52)'; then
-   echo "$(tput setaf 1)BAD BOT DETECTED - $(tput setaf 2)TEST PASSED"
-else
-   echo "$(tput setaf 1)BAD BOT NOT DETECTED - TEST FAILED"
-   #exit 1
-fi
-}
-run_curltest11
-
-# **************************************************
-# Function Curl Test 12 - Check for Bad Bot "Nutch"
-# **************************************************
-
-run_curltest12 () {
-printf '\n%s\n%s\n%s\n\n' "############################" "TESTING FALSE POSITIVE CASES" "############################"
-if curl -v -A "Mozilla/5.0 (compatible; Googlebot-Image/Snutch\-/-2.1; +http://www.google.com/bot.html)" http://localhost:9000/index.php 2>&1 | grep -i 'Welcome'; then
-   echo "$(tput setaf 2)NO FALSE POSITIVE - TEST PASSED"
-else
-   echo "$(tput setaf 1)FALSE POSITIVE - TEST FAILED"
-fi
-}
-run_curltest12
-
-# **************************************************
-# Function Curl Test 13 - Check for Bad Bot "Nutch"
-# **************************************************
-
-run_curltest13 () {
-printf '\n%s\n%s\n%s\n\n' "############################" "TESTING FALSE POSITIVE CASES" "############################"
-if curl -v -A "SnutchMozilla/5.0 (compatible; Googlebot-Image/SMutch\-/-2.1; +http://www.google.com/bot.html)" http://localhost:9000/index.php 2>&1 | grep -i 'Welcome'; then
-   echo "$(tput setaf 2)NO FALSE POSITIVE - TEST PASSED"
-else
-   echo "$(tput setaf 1)FALSE POSITIVE - TEST FAILED"
-fi
-}
-run_curltest13
-
-# **************************************************
-# Function Curl Test 14 - Check for Good Bot
-# **************************************************
-
-run_curltest14 () {
-printf '\n%s\n%s\n%s\n\n' "############################" "TESTING FALSE POSITIVE CASES" "############################"
-if curl -v -A "Mozilla/5.0 (X11; Linux x86_64; rv:67.0) Gecko/20100101 Firefox/67.0" http://localhost:9000/index.php 2>&1 | grep -i 'Welcome'; then
-   echo "$(tput setaf 2)NO FALSE POSITIVE - TEST PASSED"
-else
-   echo "$(tput setaf 1)FALSE POSITIVE - TEST FAILED"
-fi
-}
-run_curltest14
-
-
-# **************************************************
-# Function Curl Test 15 - TEST CASES
-# **************************************************
-
-run_curltest15 () {
-printf '\n%s\n%s\n%s\n\n' "############################" "TESTING FALSE POSITIVE CASES" "############################"
-if curl -v -A "Mozilla/5.0 (X11; Linux x86_64; rv:67.0) Gecko/20100101 Firefox/67.0" http://localhost:9000/index.php 2>&1 | grep -i 'Welcome'; then
-   echo "$(tput setaf 2)NO FALSE POSITIVE - TEST PASSED"
-else
-   echo "$(tput setaf 1)FALSE POSITIVE - TEST FAILED"
-fi
-}
-run_curltest15
-
-echo "Tests Completed"
-
-# **********************
-# Exit With Error Number
-# **********************
-
-exit ${?}
-
-
diff --git a/.dev-tools/run-curl-tests-testing-of-changes.sh b/.dev-tools/test-blocker.sh
similarity index 100%
rename from .dev-tools/run-curl-tests-testing-of-changes.sh
rename to .dev-tools/test-blocker.sh
diff --git a/.travis.yml b/.travis.yml
index 752bb8469..d2da4a9ba 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -39,15 +39,15 @@ script:
   - bash .dev-tools/pull-data.sh
   - bash .dev-tools/generate-files.sh
   - bash .dev-tools/install-nginx-1.sh
-  - bash .dev-tools/run-curl-tests.sh
+  - bash .dev-tools/test-blocker.sh
   - bash .dev-tools/install-nginx-testing-of-changes.sh
-  - bash .dev-tools/run-curl-tests.sh
+  - bash .dev-tools/test-blocker.sh
   #- bash .dev-tools/install-nginx-2.sh
-  #- bash .dev-tools/run-curl-tests.sh
+  #- bash .dev-tools/test-blocker.sh
   #- bash .dev-tools/install-nginx-3.sh
-  #- bash .dev-tools/run-curl-tests.sh
+  #- bash .dev-tools/test-blocker.sh
   #- bash .dev-tools/install-nginx-4.sh
-  #- bash .dev-tools/run-curl-tests.sh
+  #- bash .dev-tools/test-blocker.sh
   - bash .dev-tools/modify-files-and-commit.sh
 
 before_deploy: