                body))))))
 
 (deftest single-service-status-endpoint-test
-  (with-app-with-config
+  (with-status-service
     app
-    [jetty9-service/jetty9-service
-     webrouting-service/webrouting-service
-     status-service
-     foo-service]
-    {:webserver {:port 8180
-                 :host "0.0.0.0"}
-     :web-router-service {:puppetlabs.trapperkeeper.services.status.status-service/status-service "/status"}}
+    [foo-service]
     (testing "returns service information for service that has registered a callback"
       (let [req (http-client/get "http://localhost:8180/status/v1/services/foo")]
         (is (= 200 (:status req)))

               (json/parse-string (slurp (:body req)))))))))

(deftest error-handling-test
  (with-app-with-config
    app
    [jetty9-service/jetty9-service
     webrouting-service/webrouting-service
     status-service]
    {:webserver {:port 8180
                 :host "0.0.0.0"}
     :web-router-service {:puppetlabs.trapperkeeper.services.status.status-service/status-service "/status"}}
    (testing "returns a 400 when an invalid level is queried for"
      (let [req (http-client/get "http://localhost:8180/status/v1/services?level=bar")]
        (is (= 400 (:status req)))

    context))

(deftest rollup-status-endpoint-test
  (with-status-service
    app
    [foo-service
     bar-service]
    (testing "returns latest status for all services"
      (let [req (http-client/get "http://localhost:8180/status/v1/services")
            body (json/parse-string (slurp (:body req)))]
