       (bootstrap/bulk-index-concepts "PROV1" :collection colls)
       (bootstrap/bulk-index-concepts "PROV1" :granule [(:concept-id gran2)])
       (bootstrap/bulk-index-concepts "PROV1" :tag [(:concept-id tag1)])
-      (bootstrap/bulk-index-concepts "CMR" :access-group [(:concept-id group2)])
-      (bootstrap/bulk-index-concepts "CMR" :acl [(:concept-id acl2)])
+      ;; Commented out until ACLs and groups are supported in the index by concept-id API
+      ; (bootstrap/bulk-index-concepts "CMR" :access-group [(:concept-id group2)])
+      ; (bootstrap/bulk-index-concepts "CMR" :acl [(:concept-id acl2)])
 
       (index/wait-until-indexed)
 

          :granule [gran2])

        ; ;; ACLs
        (let [response (ac/search-for-acls (u/conn-context) {} {:token (tc/echo-system-token)})
              items (:items response)]
          (search-results-match? items [acl2]))

        ;; Groups
        (let [response (ac/search-for-groups (u/conn-context) {})
              ;; Need to filter out admin group created by fixture
              items (filter #(not (= "mock-admin-group-guid" (:legacy_guid %))) (:items response))]
          (search-results-match? items [group2]))

        (are3 [expected-tags]
          (let [result-tags (update

  (s/only-with-real-database
    ;; Disable message publishing so items are not indexed.
    (dev-sys-util/eval-in-dev-sys `(cmr.metadata-db.config/set-publish-messages! false))

    ;; Remove fixture ACLs
    (let [response (ac/search-for-acls (u/conn-context) {} {:token (tc/echo-system-token)})
          items (:items response)]
      (doseq [acl items]
        (e/ungrant (s/context) (:concept_id acl))))

    (let [;; saved but not indexed
          coll1 (save-collection 1)
          coll2 (save-collection 2 {:revision-date "3016-01-01T10:00:00Z"})
