       (testing "The CLI service has the CLI data."
         (let [config-file-path  "/path/to/config/files"
               cli-data          (trapperkeeper/parse-cli-args! ["--config" config-file-path "--debug"])
-              app-with-cli-args (trapperkeeper/bootstrap* (parse-bootstrap-config! (StringReader. bootstrap-config)) cli-data)
+              app-with-cli-args (parse-and-bootstrap (StringReader. bootstrap-config) cli-data)
               cli-data-fn       (trapperkeeper/get-service-fn app-with-cli-args :cli-service :cli-data)]
           (is (not (empty? (cli-data-fn))))
           (is (cli-data-fn :debug))

        (is (thrown-with-msg?
              IllegalArgumentException
              #"Invalid service graph;"
              (trapperkeeper/bootstrap* (parse-bootstrap-config! bootstrap-config)))))))

  (testing "CLI arg parsing"
    (testing "CLI args are parsed to a map"

puppetlabs.trapperkeeper.examples.bootstrapping.test-services/hello-world-service

"
          app                 (parse-and-bootstrap (StringReader. bootstrap-config))]

      (testing "Can load a service based on a valid bootstrap config string"
        (let [test-fn             (trapperkeeper/get-service-fn app :foo-test-service :test-fn)
