     (let [sm (create-singular-unique-key-entity)
           [ida idb] [(uuid/v1) (uuid/v1)]
 
-          _ @(r/insert tu/*model-session*
-                       :singular_unique_key_test
-                       {:id ida :nick "foo"})
-          _ @(r/insert tu/*model-session*
-                       :singular_unique_key_test_by_nick
-                       {:nick "foo" :id ida})]
+          _ (tu/insert-record :singular_unique_key_test {:id ida :nick "foo"})
+          _ (tu/insert-record :singular_unique_key_test_by_nick
+                              {:nick "foo" :id ida})]
 
       (testing "release singular stale unique key"
         (let [[[status key-desc reason]] @(uk/release-stale-unique-keys


    (testing "attempting to release someone else's key"
      (let [;; first give the key back to ida
            _ (r/insert tu/*model-session*
                        :unique_key_test_by_nick
                        {:nick "foo" :id ida})
            [status key-desc reason] @(uk/release-unique-key
                                       tu/*model-session*
                                       m

              r @(uk/upsert-primary-record-without-unique-keys
                  tu/*model-session*
                  m
                  {:id id :nick "foogle" :a "newa" :b "newb"}
                  (ts/default-timestamp-opt
                   {:only-if [[:= :nick "blah"]]}))]
          (is (= [nil
                  [[:upsert/primary-record-upsert-error
                    {:record
                     {:id id,
                      :nick "foogle",
                      :a "newa",
                      :b "newb"},
                     :if-not-exists nil,
