diff --git a/.travis.yml b/.travis.yml
index c458303a..7face288 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -119,6 +119,8 @@ jobs:
         - echo "Running Test Scripts"
         - ./travis/test_docker_image_version "$OS_BUILD_VERSION_TAG"
         - ./travis/regression_test_script -i "$OS_SNAPSHOT_IMAGE_TAG" -l "$TESTS_LOG_BASE" -V "$HYRAX_WEB_UI_VERSION"
+        - $TRAVIS_BUILD_DIR/travis/test_hyrax_service_version "http://localhost:8080/opendap" "$HYRAX_WEB_UI_VERSION"
+
 
     - stage: BUILD
       name: "Build opendap/besd"
@@ -141,8 +143,8 @@ jobs:
         - docker image ls -a
         - cd "$TRAVIS_BUILD_DIR"
         - echo "Running Test Scripts"
-        - ./travis/test_docker_image_version "$OS_BUILD_VERSION_TAG"
         - ./travis/test_image_starts_without_crashing.sh "$OS_BUILD_VERSION_TAG"
+        - ./travis/test_docker_image_version "$OS_BUILD_VERSION_TAG"
 
     - stage: BUILD
       name: "Build opendap/hyrax_ncwms"
@@ -233,6 +235,7 @@ jobs:
         - cd "$TRAVIS_BUILD_DIR"
         - echo "Running Hyrax Regression Test Script on $OS_BUILD_VERSION_TAG" >&2
         - $TRAVIS_BUILD_DIR/travis/regression_test_script -V "$HYRAX_WEB_UI_VERSION" -i "$OS_BUILD_VERSION_TAG" -l "deployed-image-regression-tests-$TRAVIS_JOB_NUMBER"
+        - $TRAVIS_BUILD_DIR/travis/test_hyrax_service_version "http://localhost:8080/opendap" "$HYRAX_WEB_UI_VERSION"
         - export DEPLOY_ME="false"
 
 after_success:
diff --git a/travis/regression_test_script b/travis/regression_test_script
index 02728fbf..dc3ba073 100755
--- a/travis/regression_test_script
+++ b/travis/regression_test_script
@@ -10,6 +10,13 @@ set -e
 #           -i "$OS_BUILD_VERSION_TAG" \
 #           -l "deployed-image-regression-tests-$TRAVIS_JOB_NUMBER"
 #
+# This script starts the target docker image and then runs the
+# hyrax_regression_tests on the new server.
+#
+# !! NOTE !!
+#   As written this script leaves the tested hyrax docker container
+#   running so that downstream service tests can be easily run.
+#
 HR0="#######################################################################"
 HR1="- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -"
 HR2="--- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---"
@@ -255,163 +262,6 @@ function clean_and_start() {
     loggy "$HR0"
 }
 
-#########################################################################################################
-# check_version()
-#     Verify that we have the expected server version
-function check_version() {
-    local prolog="check_version() -"
-    loggy "$HR0"
-    loggy "$prolog BEGIN"
-
-    local d_id="$1"
-    if test -z "$d_id"; then
-        loggy "$prolog ERROR! You must pass valid docker id as parameter 1"
-        return 1
-    fi
-
-    local end_point_url="$2"
-    if test -z "$end_point_url"; then
-        loggy "$prolog ERROR! You must pass a Hyrax endpoint url string as parameter 2"
-        return 2
-    fi
-
-    local expected_hyrax_version="$3"
-    if test -z "$expected_hyrax_version"; then
-        loggy "$prolog ERROR! You must pass a Hyrax endpoint url string as parameter 3"
-        return 3
-    fi
-
-    local docker_version_label
-    local docker_version_status
-    local status
-    local version_url
-    local version_response
-    local hyrax_version_value
-    local version_url="$end_point_url/hyrax/version"
-    local contents_url="$end_point_url/hyrax/contents.html"
-    local ifh_url="$end_point_url/hyrax/data/nc/fnoc1.nc.dmr.html"
-
-    #####################################################
-    # Get Hyrax version response from the running server
-    loggy "$prolog Retrieving Hyrax Version Response from: '$version_url'"
-    version_response="$(curl -s -c cookies -b cookies -n "$NETRC_FILE" -L "$version_url")"
-    loggy "$prolog Hyrax Version Response:"
-    loggy "$version_response"
-    loggy "$HR1"
-
-    ############################################################
-    # Verify Hyrax Version Injection
-    #   Get this line from the version response:
-    #       <Hyrax version="##########" />
-    #   and then use awk to get the actual value of ##########
-    hyrax_version_value="$(echo "$version_response" | grep "<Hyrax version" | awk '{split($0, a, "\""); print a[2];}')"
-    loggy "$prolog hyrax_version_response: $hyrax_version_value"
-    loggy "$prolog expected_hyrax_version: $expected_hyrax_version"
-    if test "$expected_hyrax_version" == "$hyrax_version_value"; then
-        loggy "$prolog SUCCESS!
-        The value of the Hyrax version returned in the Hyrax version response from the tested docker image matches the
-        expected_hyrax_version value."
-    else
-        loggy "$prolog ERROR!
-        The value of the hyrax version string '$hyrax_version_value' returned in the version
-        response does not match the expected_hyrax_version env value '$expected_hyrax_version'
-        in this production environment!"
-        return 1
-    fi
-    loggy "$HR1"
-    loggy "$prolog Checking docker image metadata for correct Hyrax version..."
-    local version_label_key="org.opendap.hyrax.version"
-    docker_version_label=$(docker inspect --format="{{ index .Config.Labels \"$version_label_key\" }}" "$d_id")
-    docker_version_status=$?
-    loggy "docker_version_label: '$docker_version_label'"
-    if test "$expected_hyrax_version" = "$docker_version_label"; then
-        loggy "$prolog SUCCESS!
-        The 'docker inspect' command for $d_id returned the expected_hyrax_version value."
-    else
-        loggy "$prolog ERROR!
-        The value of the hyrax version string '$docker_version_label' found in the docker
-        inspect response does not match the expected_hyrax_version env value '$expected_hyrax_version'
-        in this production environment!"
-        return 1
-    fi
-
-    local deployment_context="opendap"
-    local some_page
-    if test "$DOCKER_NAME" = "ngap"
-    then
-        deployment_context="ROOT"
-        loggy "$HR1"
-        loggy "$prolog Checking NGAP landing page for correct Hyrax version."
-        some_page="$(docker exec -it $d_id bash -c "cat /usr/share/tomcat/webapps/$deployment_context/docs/ngap/ngap.html")"
-        # loggy "$prolog NGAP Landing Page: "
-        # loggy "$some_page"
-        echo "$some_page" | grep "$expected_hyrax_version"
-        status=$?
-        if test $status -ne 0
-        then
-            loggy "$prolog ERROR! The expected version string as not found in the version.xsl file."
-            return  $status
-        fi
-    fi
-
-    loggy "$HR1"
-    loggy "$prolog Expecting docker id: $d_id"
-    loggy "$prolog docker container ls -a:"
-    docker container ls -a
-
-    #####################################################################
-    # Check version.xsl
-    #
-    loggy "$HR1"
-    loggy "$prolog Checking version.xsl for correct Hyrax version, d_id: $d_id"
-    some_page="$(docker exec -it "$d_id" bash -c "cat /usr/share/tomcat/webapps/$deployment_context/xsl/version.xsl")"
-    #loggy "$prolog version.xsl: "
-    #loggy "$some_page"
-    echo "$some_page" | grep "$expected_hyrax_version"
-    status=$?
-    if test $status -ne 0
-    then
-        loggy "$prolog ERROR! The expected version string as not found in the version.xsl file."
-        return  $status
-    fi
-
-    #####################################################################
-    # Check contents.html
-    #
-    loggy "$HR1"
-    loggy "$prolog Checking contents.html for correct Hyrax version."
-    some_page="$(curl -s -c cookies -b cookies -n "$NETRC_FILE" -L "$contents_url")"
-    # loggy "$prolog $contents_url: "
-    # loggy "$some_page"
-    echo "$some_page" | grep "$expected_hyrax_version"
-    status=$?
-    if test $status -ne 0
-    then
-        loggy "$prolog ERROR! The expected version string as not found in the contents.html page."
-        return  $status
-    fi
-
-    #####################################################################
-    # Check DAP4 Data Request Form
-    #
-    loggy "$HR1"
-    loggy "$prolog Checking DAP4 Data Request Form page for correct version."
-    some_page="$(curl -s -c cookies -b cookies -n "$NETRC_FILE" -L "$ifh_url")"
-    # loggy "$prolog $ifh_url: "
-    # loggy "$some_page"
-    echo "$some_page" | grep "$expected_hyrax_version"
-    status=$?
-    if test $status -ne 0
-    then
-        loggy "$prolog ERROR! The expected version string as not found in the Data Request Form page."
-        return  $status
-    fi
-
-    loggy "$prolog END"
-    loggy "$HR0"
-    return 0
-}
-
 #########################################################################################################
 # run_regression_tests()
 #     Run the Hyrax regression tests against the Hyrax server @ $endpoint
@@ -555,11 +405,6 @@ function run_the_tests() {
     loggy "$prolog wait_for_hyrax status: $wait_for_hyrax_status"
     if test $wait_for_hyrax_status -ne 0; then exit $wait_for_hyrax_status; fi
 
-    check_version "$DOCKER_ID" "$HYRAX_END_POINT" "$EXPECTED_HYRAX_VERSION"
-    local check_version_status=$?
-    loggy "$prolog check_version status: $check_version_status"
-    if test $check_version_status -ne 0; then exit $check_version_status; fi
-
     run_regression_tests "$TEST_IMAGE_NAME" "$HYRAX_END_POINT" "$DOCKER_ID"
     local run_regression_tests_status=$?
     loggy "$prolog run_regression_tests status: $run_regression_tests_status"
@@ -590,6 +435,8 @@ loggy "$prolog             TEST_NAMES: $TEST_NAMES"
 loggy "$prolog         TESTS_LOG_BASE: $TESTS_LOG_BASE"
 loggy "$prolog              DOCKER_ID: $DOCKER_ID"
 
+#############################################################################
+# Run or source? What doing?
 if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
     # Run the script invoked as an application,
     set -e
diff --git a/travis/test_docker_image_version b/travis/test_docker_image_version
index 92cea459..b49b4fd3 100755
--- a/travis/test_docker_image_version
+++ b/travis/test_docker_image_version
@@ -1,4 +1,17 @@
 #!/bin/bash
+#############################################################################
+# test_docker_image_version
+#
+# Travis invocation:
+#
+#  - ./travis/test_docker_image_version "$OS_BUILD_VERSION_TAG"
+#
+# This script examines an OPeNDAP docker image to see if the version numbers
+# of the components have been correctly injected into the image by our CICD.
+#
+# The docker image does not need to be running in a container to run this
+# test as the image is interrogated directly.
+#
 
 HR0="#######################################################################"
 HR1="- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -"
@@ -12,7 +25,7 @@ function loggy() {
 #########################################################################################################
 # test_docker_image_label()
 #     Looks at the metadata of docker image 'd_id' ($1) using docker 'inspect'
-#     to retrieve the value of 'label_key' ($2) from the docker .Config.Labels
+#     to retrieve the value of 'label_key' ($2) from the docker ".Config.Labels"
 #     The retrieved value is compared with the 'expected_value' ($3)
 #
 function test_docker_image_label() {
@@ -21,8 +34,22 @@ function test_docker_image_label() {
     loggy "$prolog BEGIN"
 
     local d_id="$1"
+    if test -z "$d_id"; then
+        loggy "$prolog ERROR! You must pass valid docker id as parameter 1"
+        return 1
+    fi
+
     local label_key="$2"
+    if test -z "$label_key"; then
+        loggy "$prolog ERROR! You must a docker label key name as parameter 2"
+        return 2
+    fi
+
     local expected_value="$3"
+    if test -z "$expected_value"; then
+        loggy "$prolog ERROR! You must pass the expected value as parameter 3"
+        return 3
+    fi
 
     local docker_labels
     local status
@@ -52,34 +79,52 @@ function test_docker_image_label() {
     return 0
 }
 
-
 #########################################################################################################
 # test_file_in_docker_image()
 #     Looks inside docker image 'd_id' ($1) in the file
 #     named file_path ($2) for the string 'expected_value' ($3)
 #
+# This is accomplished by starting the container with "--rm" in order to 'cat'
+# the target file.
+#
+# The "--rm" switch causes the automatic removal of the container and its associated
+# anonymous volumes when the "cat" command exits.
+#
 function test_file_in_docker_image() {
     local prolog="test_file_in_docker_image() -"
     loggy "$HR2"
     loggy "$prolog BEGIN"
 
     local d_id="$1"
+    if test -z "$d_id"; then
+        loggy "$prolog ERROR! You must pass valid docker id as parameter 1"
+        return 1
+    fi
     local file_path="$2"
-    local expected_value="$3"
+    if test -z "$file_path"; then
+        loggy "$prolog ERROR! You must pass a fully qualified file path as 2"
+        return 3
+    fi
+
+    local search_value="$3"
+    if test -z "$search_value"; then
+        loggy "$prolog ERROR! You must pass the search value as parameter 3"
+        return 3
+    fi
 
     local status
     local some_file
 
-    loggy "$prolog Checking for '$expected_value' in '$d_id::$file_path'"
+    loggy "$prolog Checking for '$search_value' in '$d_id::$file_path'"
     some_file="$(docker run --rm --entrypoint cat "$d_id" "$file_path")"
 
     #loggy "$prolog $d_id::$file_path: "
     #loggy "$some_file"
 
-    echo "$some_file" | grep "$expected_value"
+    echo "$some_file" | grep "$search_value"
     status=$?
     if test $status -ne 0; then
-        loggy "$prolog ERROR! The expected value '$expected_value' was not found in the file '$file_path'"
+        loggy "$prolog ERROR! The expected value '$search_value' was not found in the file '$file_path'"
         loggy "$prolog $d_id::$file_path: "
         loggy "$some_file"
         return $status
@@ -91,28 +136,38 @@ function test_file_in_docker_image() {
     loggy "$HR2"
     return 0
 }
-#docker cp $CONTAINER_ID:/path/in/container /path/on/host
-
 
 #########################################################################################################
 # get_docker_label_version_key()
-#   Returns the purported  Docker .Config.Labels entry for the current application build.
-#   Relies on the global variable DOCKER_NAME and embodies some inside knowledge of the irregularities
-#   In our docker labeling scheme.In particular some applications like ngap and hyrax_ncwms use
-#   the "hyrax" version in their Docker labels.
-function get_docker_label_version_key(){
+#    Returns the purported Docker ".Config.Labels" version keyname for the current application build.
+#
+# Relies on the global variable DOCKER_NAME and embodies some inside knowledge of the irregularities
+# I
+# n our docker labeling scheme.In particular some applications like ngap and hyrax_ncwms use
+# the "hyrax" version in their Docker labels.
+#
+function get_docker_label_version_key() {
     local prolog="get_docker_label_version_key() -"
-    local app_key="$DOCKER_NAME"                             # default
+    local app_key="$DOCKER_NAME" # default
     # if test -n "$DOCKER_DIR"; then app_key="$DOCKER_DIR"; fi # DOCKER_DIR if it's in use.
-    if test "$app_key" = "ngap" -o "$app_key" = "hyrax_ncwms"; then app_key="hyrax"; fi   # ngap is Hyrax so....
+    if test "$app_key" = "ngap" -o "$app_key" = "hyrax_ncwms"; then app_key="hyrax"; fi # ngap is Hyrax so....
 
     local label_version_key="org.opendap.$app_key.version"
     loggy "$prolog label_version_key: $label_version_key"
     echo "$label_version_key"
 }
 
-
-function get_expected_docker_label_version_value(){
+#########################################################################################################
+# get_expected_docker_label_version_value()
+#    Returns the value of the docker label version string for the current application build.
+#
+# Relies on the global variable DOCKER_NAME. BES_VERSION. OLFS_VERSION, and HYRAX_WEB_UI_VERSION.
+#
+# This function embodies some inside knowledge of the irregularities in our
+# docker labeling scheme. In particular the olfs and besd applications use their version specific
+# version values (and not the Hyrax version) in their Docker ".Config.Labels"  metadata labels.
+#
+function get_expected_docker_label_version_value() {
     local prolog="get_expected_docker_label_version_value() -"
     #################################################################################################
     # Target specific tweaking using global values
@@ -126,9 +181,10 @@ function get_expected_docker_label_version_value(){
 
 #########################################################################################################
 # test_docker_version_label()
-#     Examine the .Config.Labels metadata in "d_id" and test that the application version for our
-# application is correct.
-function test_docker_version_label(){
+#     Examine the .Config.Labels metadata in "d_id" and test that the application version for the
+# current application build is correct.
+#
+function test_docker_version_label() {
     local prolog="test_docker_version_label() -"
 
     local d_id="$1"
@@ -156,11 +212,11 @@ function test_docker_version_label(){
 
 }
 
-
 #########################################################################################################
 # test_docker_hyrax_version()
 #     Examine the Hyrax deployment in "d_id" and check the value of the Hyrax version strings
 # in the expected locations.
+#
 function test_docker_hyrax_versions() {
     local prolog="test_docker_hyrax_versions() -"
     loggy "$HR1"
@@ -187,18 +243,20 @@ function test_docker_hyrax_versions() {
     #################################################################
     # The NGAP build has a static landing page that needs to match.
     if test "$DOCKER_NAME" = "ngap"; then
-        test_file_in_docker_image "$d_id" "/usr/share/tomcat/webapps/$deployment_context/docs/ngap/ngap.html" "$expected_version_str"
+        local ngap_html="/usr/share/tomcat/webapps/$deployment_context/docs/ngap/ngap.html"
+        test_file_in_docker_image "$d_id" "$ngap_html" "$expected_version_str"
         status=$?
         if test $status -ne 0; then
-            loggy "$prolog ERROR! The expected version string was not found in the file."
+            loggy "$prolog ERROR! The expected version string was not found in: '$ngap_html'"
             return $status
         fi
     fi
 
     #################################################################
     # All the service deployments (except the besd) have the OLFS
-    # installed in Tomcat. We check the version.xsl static file for
-    # the Hyrax version (not the OLFS version, at least in that location)
+    # installed in Tomcat. For these we check the version.xsl static
+    # file for the Hyrax version (not the OLFS version, at least in
+    # that location)
     if test "$DOCKER_NAME" != "besd"; then
         local version_xsl="/usr/share/tomcat/webapps/$deployment_context/xsl/version.xsl"
         test_file_in_docker_image "$d_id" "$version_xsl" "$HYRAX_WEB_UI_VERSION"
@@ -214,18 +272,22 @@ function test_docker_hyrax_versions() {
 }
 
 #############################################################################
-# Processing Command Line Options (Inline Execution)
-#
+#############################################################################
+#############################################################################
+
 prolog="test_docker_image_version[] -"
 
+#############################################################################
+# Run or source? What doing?
 if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
     # Run the script invoked as an application,
     loggy "$HR0"
     loggy "$prolog BEGIN"
 
+    # #################################
+    # Processing Command Line Option
     docker_image_id="$1"
-    if test -z "$docker_image_id"
-    then
+    if test -z "$docker_image_id"; then
         loggy "ERROR! You must supply a docker id to use theis script."
         exit 1
     fi
@@ -241,13 +303,3 @@ else
     # Just source it into the current shell.
     loggy "$prolog SUCCESS! The test_docker_image_version functions have been loaded in to the current shell."
 fi
-
-
-
-
-
-
-
-
-
-
diff --git a/travis/test_hyrax_service_version b/travis/test_hyrax_service_version
index 04829372..4ec1a18f 100755
--- a/travis/test_hyrax_service_version
+++ b/travis/test_hyrax_service_version
@@ -1,62 +1,194 @@
 #!/bin/bash
-
+#############################################################################
+# test_hyrax_service_version
+#
+# Travis invocation:
+#
+#    - $TRAVIS_BUILD_DIR/travis/test_hyrax_service_version  \
+#             "http://localhost:8080/opendap" \
+#             "$HYRAX_WEB_UI_VERSION"
+#
+# This script tests a running Hyrax service to see if various HTTP responses
+# contain the expected version information.
+#
+# !! NOTE !!
+# As written this script requires a running Hyrax service!
+#
+verbose="${verbose:""}"
 HR0="#######################################################################"
 HR1="- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -"
 HR2="--- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---"
+
 #############################################################################
 # loggy()
 function loggy() {
     echo "$@" | awk '{ print "# "$0;}' >&2
 }
 
-function test_hyrax_version_response(){
-    local prolog="test_hyrax_version_response() -"
+#############################################################################
+# test_response_content()
+# This function dereferences $test_url and then uses grep to search the
+# response document for the $expected_string. If the $expected_string is
+# found in the response then the test is a success. If the $expected_string
+# is not found in response then the test fails.
+function test_response_content(){
+    local prolog="test_response_content() -"
     loggy "$HR1"
     loggy "$prolog BEGIN"
 
-    local end_point_url="$1"
-    loggy "$prolog         end_point_url: $end_point_url"
+    local test_url="$1"
+    if test -z "$test_url"; then
+        loggy "$prolog ERROR! You must pass a test url string as parameter 1"
+        return 1
+    fi
 
-    local expected_version_str="$2"
-    loggy "$prolog  expected_version_str: $expected_version_str"
+    local expected_string="$2"
+    if test -z "$expected_string"; then
+        loggy "$prolog ERROR! You must pass an expected string as parameter 2"
+        return 2
+    fi
 
+    local status
+    local some_page
 
-    local version_url="$end_point_url/hyrax/version"
-    loggy "$prolog           version_url: $end_point_url"
-
-    #####################################################
-    # Get Hyrax version response from the running server
-    loggy "$prolog Retrieving Hyrax Version Response from: '$version_url'"
-    version_response="$(curl -s -c cookies -b cookies -n $NETRC_FILE -L "$version_url")"
-    loggy "$prolog Hyrax Version Response:"
-    loggy "$version_response"
-    loggy "$HR1"
+    #####################################################################
+    # Retrieve the response foe test_url and check for the presence of
+    # expected_string within.
+    loggy "$prolog Checking '$test_url' for correct the expected string: '$expected_string'"
+    some_page="$(curl -s -c cookies -b cookies -n "$NETRC_FILE" -L "$test_url")"
 
-    ############################################################
-    # Verify Hyrax Version Injection
-    #   Get this line from the version response:
-    #       <Hyrax version="##########" />
-    #   and then use awk to get the actual value of ##########
-    local hyrax_version_value
-    hyrax_version_value="$(echo "$version_response" | grep "<Hyrax version" | awk '{split($0, a, "\""); print a[2];}')"
-    loggy "$prolog hyrax_version_response: $hyrax_version_value"
-    loggy "$prolog expected_hyrax_version: $expected_version_str"
-    if test "$expected_version_str" == "$hyrax_version_value"; then
-        loggy "$prolog SUCCESS!
-        The value of the Hyrax version returned in the Hyrax version response from the tested docker image matches the
-        expected_hyrax_version value."
+    if test -n "$verbose"
+    then
+        # Show the response when in verbose mode.
+        loggy "$prolog response document: "
+        loggy "$some_page"
+    fi
+
+    echo "$some_page" | grep "$expected_string"
+    status=$?
+    if test $status -ne 0
+    then
+        loggy "$prolog ERROR! The expected string: '$expected_string' was not found in the '$test_url' page."
+        return  $status
     else
-        loggy "$prolog ERROR!
-        The value of the hyrax version string '$hyrax_version_value' returned in the version
-        response does not match the expected_hyrax_version env value '$expected_version_str'
-        in this production environment!"
+        loggy "$prolog SUCCESS!  The test url: '$test_url' response contained the expected string: '$expected_string'"
+    fi
+    loggy "$prolog END"
+    return 0
+}
+
+
+#############################################################################
+# test_hyrax_service_endpoints()
+#     Verify that we have the expected server versions showing up in:
+#  - The Hyrax version response
+#  - The contents.html pages (blue-bar navigation pages)
+#  - The Data Request Form pages.
+function test_hyrax_service_endpoints() {
+    local prolog="test_hyrax_service_endpoints() -"
+    loggy "$HR0"
+    loggy "$prolog BEGIN"
+
+    local end_point_url="$1"
+    if test -z "$end_point_url"; then
+        loggy "$prolog ERROR! You must pass a Hyrax endpoint url string as parameter 1"
         return 1
     fi
+    loggy "$prolog end_point_url: $end_point_url"
+
+    local expected_hyrax_version="$2"
+    if test -z "$expected_hyrax_version"; then
+        loggy "$prolog ERROR! You must pass a Hyrax endpoint url string as parameter 2"
+        return 2
+    fi
+    loggy "$prolog expected_hyrax_version: $expected_hyrax_version"
+
+
+    #####################################################################
+    # Check The Hyrax Version Response
+    #
+    loggy "$prolog Checking a Hyrax version response page for the expected version string."
+
+    local version_url="$end_point_url/hyrax/version"
+    loggy "$prolog           version_url: '$version_url'"
+
+    local version_response_str="<Hyrax version=\"$expected_hyrax_version\""
+    loggy "$prolog  version_response_str: '$version_response_str'"
+
+    test_response_content   "$version_url" "$version_response_str"
+
+
+    #####################################################################
+    # Check contents.html
+    #
+    loggy "$prolog Checking a contents.html page for the expected version string."
+
+    local contents_url="$end_point_url/hyrax/contents.html"
+    loggy "$prolog Using contents_url: '$contents_url'"
+
+    local contents_version="OPeNDAP Hyrax ($expected_hyrax_version)"
+    loggy "$prolog Using contents_version: '$contents_version'"
+
+    test_response_content "$contents_url" "$contents_version"
+
+
+    #####################################################################
+    # Check DAP4 Data Request Form
+    #
+    loggy "$prolog Checking DAP4 Data Request Form page for correct version."
+
+    local ifh_url="$end_point_url/hyrax/data/nc/fnoc1.nc.dmr.html"
+    loggy "$prolog Using ifh_url: '$ifh_url'"
+
+    local ifh_version="OPeNDAP Hyrax ($expected_hyrax_version)"
+    loggy "$prolog Using ifh_version: '$ifh_version'"
+
+    test_response_content "$ifh_url" "$ifh_version"
+
     loggy "$prolog END"
-    loggy "$HR1"
+    loggy "$HR0"
     return 0
 }
 
-# test_hyrax_service_version
 
-test_hyrax_version_response $1 $2
+#########################################################################################################
+#########################################################################################################
+#########################################################################################################
+#########################################################################################################
+
+prolog="test_hyrax_service_version[] -"
+
+#############################################################################
+# Run or source? What doing?
+if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
+    # Run the script invoked as an application,
+    loggy "$HR0"
+    loggy "$prolog BEGIN"
+
+    #############################################################################
+    # Processing Command Line Options
+    #
+    end_point_url="$1"
+    if test -z "$end_point_url"; then
+        loggy "$prolog ERROR! You must pass a Hyrax endpoint url string as parameter 1"
+        return 1
+    fi
+
+    expected_hyrax_version="$2"
+    if test -z "$expected_hyrax_version"; then
+        loggy "$prolog ERROR! You must pass a Hyrax endpoint url string as parameter 2"
+        return 2
+    fi
+
+    set -e
+    test_hyrax_service_endpoints  "$end_point_url" "$expected_hyrax_version"
+
+    loggy "$prolog END"
+    loggy "$HR0"
+else
+    # Otherwise...
+    # Just source it into the current shell.
+    loggy "$prolog SUCCESS! The test_hyrax_service_version functions have been loaded in to the current shell."
+fi
+
+