       (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)
 

  (s/only-with-real-database
   ;; Disable message publishing so items are not indexed as part of the initial save.
   (dev-sys-util/eval-in-dev-sys `(cmr.metadata-db.config/set-publish-messages! false))
   (let [
         acl1 (save-acl 1
                        {:extra-fields {:acl-identity "system:token"
                                        :target-provider-id "PROV1"}}
                        "TOKEN")

       (search-results-match? items [acl1 acl2]))

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