     (let [coll1 (d/ingest "PROV1" (dc/collection {:entry-title "ET1"}))
           coll2 (d/ingest "PROV1" (dc/collection {:entry-title "ET2"}))
           coll3 (d/ingest "PROV1" (dc/collection {:entry-title "ET3"}))
-          {token :token} (vu/setup-update-acl
-                        (s/context) "PROV1" "user1" "update-group")
+          token (e/login (s/context) "user1")
           variable-name "variable1"
           assert-variable-associated (partial vu/assert-variable-associated-with-query
                                               token {:variable-name "variable1"})]
-      (vu/create-variable token (vu/make-variable {:Name variable-name}))
+      (vu/ingest-variable-with-attrs {:Name variable-name})
       (index/wait-until-indexed)
       (vu/associate-by-concept-ids token variable-name [{:concept-id (:concept-id coll1)}
                                                         {:concept-id (:concept-id coll2)

        all-prov3-colls [c1-p3 c2-p3 c3-p3 c4-p3]
        all-colls (concat all-prov1-colls all-prov2-colls all-prov3-colls)
        variable-name "variable1"
        variable (vu/make-variable-concept {:Name variable-name})
        {token :token} (vu/setup-update-acl
                        (s/context) "PROV1" "user1" "update-group")
        prov3-token (e/login (s/context) "prov3-user" [group1-concept-id])
        {:keys [concept-id]} (vu/ingest-variable
                              variable
                              (vu/token-opts token))
        assert-variable-associated (partial vu/assert-variable-associated-with-query
                                            prov3-token {:variable-name "variable1"})]
    (index/wait-until-indexed)

  ;; Create 4 collections in each provider that are identical.
  ;; The first collection will have data:
  ;; {:entry-id "S1_V1", :entry_title "ET1", :short-name "S1", :version-id "V1"}
  (let [[c1-p1 c2-p1 c3-p1 c4-p1
         c1-p2 c2-p2 c3-p2 c4-p2
         c1-p3 c2-p3 c3-p3 c4-p3] (for [p ["PROV1" "PROV2" "PROV3"]
                                        n (range 1 5)]
                                    (:concept-id (d/ingest p (dc/collection
                                                              {:short-name (str "S" n)
                                                               :version-id (str "V" n)
                                                               :entry-title (str "ET" n)}))))
        all-prov1-colls [c1-p1 c2-p1 c3-p1 c4-p1]
        all-prov2-colls [c1-p2 c2-p2 c3-p2 c4-p2]
        token (e/login (s/context) "user1")
        variable-name "variable1"
        {:keys [concept-id]} (vu/ingest-variable-with-attrs {:Name variable-name})]
    (index/wait-until-indexed)

    (testing "Associate variable with collections by concept-ids"
