           (r/replace-state @self {:foo "there"})
           (r/state @self)
 
-          (rflush)
+          (r/flush)
           (is (= "hi there" (.-innerText div)))
 
           (r/set-state @self {:foo "you"})
-          (rflush)
+          (r/flush)
           (is (= "hi you" (.-innerText div)))))
       (is (= 4 @ran)))))
 
 (deftest test-ratom-change
-  (when isClient
+  (when r/is-client
     (let [ran (r/atom 0)
-          runs (running)
+          runs (rv/running)
           val (r/atom 0)
           secval (r/atom 0)
           v1-ran (atom 0)

          (is (= 1 @ran))
          (is (= "state=0" (.-innerText div)))
          (reset! state 1)
          (rflush)
          (is (= 2 @ran))
          (is (= "state=3" (.-innerText div)))))
      (is (= 2 @ran)))))

               (is (= "Error" (.-innerText div))))))))))

(deftest get-snapshot-before-update-test
  (when r/is-client
    (let [ref (react/createRef)
          prop (r/atom 0)
          did-update (atom nil)
