         ;; then create a group that contains our user, so we can find collections that grant access to this user
         user1-group (create-group {:name "groupwithuser1" :members ["user1"]})
         ;; create some collections
-        ingest-prov1-collection #(u/save-collection {:provider-id "PROV1"
+        save-prov1-collection #(u/save-collection {:provider-id "PROV1"
                                                      :entry-title (str % " entry title")
                                                      :native-id %
                                                      :short-name %})
-        coll1 (ingest-prov1-collection "coll1")
-        coll2 (ingest-prov1-collection "coll2")
-        coll3 (ingest-prov1-collection "coll3")
-        gran1 (:concept-id
-                (mdb/save-concept (u/conn-context)
-                                  {:format "application/echo10+xml"
-                                   :metadata granule-metadata
-                                   :concept-type :granule
-                                   :provider-id "PROV1"
-                                   :native-id "gran1"
-                                   :revision-id 1
-                                   :extra-fields {:short-name "gran1"
-                                                  :entry-title "gran1"
-                                                  :entry-id "gran1"
-                                                  :granule-ur "gran1ur"
-                                                  :version-id "v1"
-                                                  :parent-collection-id coll1
-                                                  :parent-entry-title "coll1"}}))
+        coll1 (save-prov1-collection "coll1")
+        coll2 (save-prov1-collection "coll2")
+        coll3 (save-prov1-collection "coll3")
+        gran1 (save-granule coll1)
         ;; local helpers to make the body of the test cleaner
         create-acl #(:concept_id (ac/create-acl (u/conn-context) % {:token token}))
         update-acl #(ac/update-acl (u/conn-context) %1 %2 {:token token})

        created-group-concept-id (:concept_id (u/create-group token group))
        ;; required for ACLs that will reference this group
        _ (u/wait-until-indexed)
        ingest-prov1-collection #(u/save-collection {:provider-id "PROV1"
                                                      :entry-title (str % " entry title")
                                                      :native-id %
                                                      :short-name %})
        coll1 (ingest-prov1-collection "coll1")
        gran1 (:concept-id
                (mdb/save-concept (u/conn-context)
                                  {:format "application/echo10+xml"
                                   :metadata granule-metadata
                                   :concept-type :granule
                                   :provider-id "PROV1"
                                   :native-id "gran1"
                                   :revision-id 1
                                   :extra-fields {:short-name "gran1"
                                                  :entry-title "gran1"
                                                  :entry-id "gran1"
                                                  :granule-ur "gran1ur"
                                                  :version-id "v1"
                                                  :parent-collection-id coll1
                                                  :parent-entry-title "coll1 entry title"}}))
        create-acl #(:concept_id (ac/create-acl (u/conn-context) % {:token token}))
        update-acl #(ac/update-acl (u/conn-context) %1 %2 {:token token})]


				    <Orderable>true</Orderable>
				</Granule>")

(def granule-num
  "An atom storing the next number used to generate unique granules."
  (atom 0))

(defn save-granule
  "Saves a granule with given property map to metadata db and returns concept id."
  [parent-collection-id]
  (let [short-name (str "gran" (swap! granule-num inc))
        version-id "v1"
        native-id short-name
        parent-collection (mdb/get-latest-concept (u/conn-context) parent-collection-id)]
    (:concept-id
      (mdb/save-concept (u/conn-context)
                        {:format "application/echo10+xml"
                         :metadata granule-metadata
                         :concept-type :granule
                         :provider-id "PROV1"
                         :native-id native-id
                         :revision-id 1
                         :extra-fields {:short-name short-name
                                        :entry-title short-name
                                        :entry-id (str short-name "_" version-id)
                                        :granule-ur (str short-name "ur")
                                        :version-id version-id
                                        :parent-collection-id parent-collection-id
                                        :parent-entry-title (:entry-title (:extra-fields parent-collection))}}))))

(deftest collection-simple-catalog-item-identity-permission-check-test
  ;; tests ACLs which grant access to collections based on provider id and/or entry title
  (let [token (e/login (u/conn-context) "user1" ["group-create-group"])
