          durs durs
          t (now)]
     (when (and notes durs)
-      (sc/hit t inst :pitch (first notes) :dur (first durs))
+      (hit t inst :pitch (first notes) :dur (first durs))
       (recur (next notes) (next durs) (+ t (first durs))))))
 
 (deftest boot-test []
   (try 
-    (sc/boot)
-    (is (not (nil? @sc/server*)))
-    (is (= 1 (:n-groups (sc/status))))
+    (boot)
+    (is (not (nil? @server*)))
+    (is (= 1 (:n-groups (status))))
     (play "sin" ditty-notes ditty-durs)
     (Thread/sleep 3000)
     (finally 
-      (sc/quit))))
+      (quit))))
 
 (defn groups-test []
-  (sc/group :head sc/DEFAULT-GROUP)
-  (sc/group :head sc/DEFAULT-GROUP)
-  (sc/group :head sc/DEFAULT-GROUP)
-  (is (= 4 (:n-groups (sc/status)))))
+  (group :head DEFAULT-GROUP)
+  (group :head DEFAULT-GROUP)
+  (group :head DEFAULT-GROUP)
+  (is (= 4 (:n-groups (status)))))
 
 (defn node-tree-test []
-  (sc/reset)
-  (sc/group :head 0)
-  (sc/group :tail 0)
-  (sc/hit :sin :dur 10000 :target 2)
-  (is (= 1 (:n-synths (sc/status)))))
+  (reset)
+  (group :head 0)
+  (group :tail 0)
+  (hit :sin :dur 10000 :target 2)
+  ;(is (= 1 (:n-synths (status))))
+  )
 
 ; These are what the responses look like for a queryTree msg.  The first
 ; without and the second with control information.

     clojure.test
     clojure.contrib.seq-utils
     clj-backtrace.repl
     overtone.utils)
  (:require 
     [overtone.sc :as sc]
     [overtone.log :as log]))

(def ditty-notes [50 50 57 50 48 62 62 50])


(deftest server-messaging-test []
  (try
    (boot)
    (groups-test)
    (node-tree-test)
    (finally 
      (quit))))
