         (index/wait-until-indexed)
 
         (testing "retrieval of deleted concept without revision id results in error"
-          (verify-retrieved-concept-error concept-id nil accept-format 404
+          (assert-retrieved-concept-error concept-id nil accept-format 404
             (format "Concept with concept-id [%s] could not be found." concept-id)))
 
         (testing "retrieval of deleted concept with revision id returns a 400 error"
-          (verify-retrieved-concept-error concept-id 3 accept-format 400
+          (assert-retrieved-concept-error concept-id 3 accept-format 400
             (format (str "The revision [3] of concept [%s] represents "
                          "a deleted concept and does not contain metadata.")
                     concept-id)))))))

  [(ingest/reset-fixture {"provguid1" "PROV1"})
   service/grant-all-service-fixture]))

(defn- verify-retrieved-concept
  "Verify the retrieved concept by checking against the expected service name,
  which we have deliberately set to be different form each concept revision."
  [concept-id revision-id accept-format expected-service-name]
  (let [{:keys [status body]} (search/retrieve-concept
                               concept-id revision-id {:accept accept-format})]
    (is (= 200 status))
    (is (=  expected-service-name
            (:Name (json/parse-string body true))))))

(defmulti handle-retrieve-concept-error
  "Exectue the retrieve concept call with the given parameters and returns the status and errors
  based on the result format"
  (fn [concept-id revision-id accept-format]
    accept-format))


   (search/retrieve-concept concept-id revision-id {:accept accept-format
                                                    :throw-exceptions true})))

(defn- assert-retrieved-concept-error
  "Verify the expected error code and error message are returned when retrieving the given concept."
  [concept-id revision-id accept-format err-code err-message]
  (let [{:keys [status errors]} (handle-retrieve-concept-error
