diff --git a/env/dev/reagentdemo/dev.cljs b/env/dev/reagentdemo/dev.cljs
deleted file mode 100644
index d2e84fe..0000000
--- a/env/dev/reagentdemo/dev.cljs
+++ /dev/null
@@ -1,14 +0,0 @@
-(ns reagentdemo.dev
-    (:require [reagentdemo.core :as demo]
-              [reagenttest.runtests :as tests]
-              [reagent.core :as r]
-              [figwheel.client :as fw]))
-
-(defn reload []
-  (demo/init!)
-  (tests/init!))
-
-(when r/is-client
-  (fw/start
-   {:on-jsload reload
-    :websocket-url "ws://localhost:3449/figwheel-ws"}))
diff --git a/project.clj b/project.clj
index 00c5a32..9c4abc3 100644
--- a/project.clj
+++ b/project.clj
@@ -23,8 +23,9 @@
                     :cljsbuild
                     {:builds
                      {:client
-                      {:source-paths ["env/dev"]
-                       :compiler {:main "reagentdemo.dev"
+                      {;;:source-paths ["env/dev"]
+                       :figwheel {:on-jsload "reagenttest.runtests/reload"}
+                       :compiler {:main "reagenttest.runtests"
                                   :source-map true
                                   :source-map-timestamp true
                                   :optimizations :none
@@ -69,5 +70,4 @@
                         :compiler {:output-to "outsite/public/js/main.js"}}}}
   
   :figwheel {:http-server-root "public" ;; assumes "resources"
-             :repl false
-             })
+             :repl false})
diff --git a/src/reagent/ratom.clj b/src/reagent/ratom.clj
index 11c8770..b14ced4 100644
--- a/src/reagent/ratom.clj
+++ b/src/reagent/ratom.clj
@@ -1,4 +1,5 @@
-(ns reagent.ratom)
+(ns reagent.ratom
+  (:refer-clojure :exclude [run!]))
 
 (defmacro reaction [& body]
   `(reagent.ratom/make-reaction
diff --git a/src/reagent/ratom.cljs b/src/reagent/ratom.cljs
index 073f3cd..b796be2 100644
--- a/src/reagent/ratom.cljs
+++ b/src/reagent/ratom.cljs
@@ -1,7 +1,8 @@
 (ns reagent.ratom
-  (:refer-clojure :exclude [atom run!])
-  (:require-macros [reagent.debug :refer (dbg log warn dev?)])
-  (:require [reagent.impl.util :as util]))
+  (:refer-clojure :exclude [atom])
+  (:require-macros [reagent.ratom])
+  (:require [reagent.impl.util :as util]
+            [reagent.debug :refer-macros [dbg log warn dev?]]))
 
 (declare ^:dynamic *ratom-context*)
 
diff --git a/test/reagenttest/runtests.cljs b/test/reagenttest/runtests.cljs
index 1241918..1321d2e 100644
--- a/test/reagenttest/runtests.cljs
+++ b/test/reagenttest/runtests.cljs
@@ -50,4 +50,8 @@
     (reset! demo/test-results [#'test-output-mini])
     (run-tests)))
 
+(defn reload []
+  (demo/init!)
+  (init!))
+
 (init!)