         (is guid)))
 
     (truncate-n-test cluster "putname is idempotent"
-      (is (= (server/handle-message cluster ["put" "name" "user" "tree" "kind" "foobar"]) (server/handle-message cluster ["put" "name" "user" "tree" "kind" "foobar"]))))
+      (is (= (handle-message-macro cluster ["put" "name" "user" "tree" "kind" "foobar"]) (handle-message-macro cluster ["put" "name" "user" "tree" "kind" "foobar"]))))
 
     (truncate-n-test cluster "getguid after putname"
-      (is (= (server/handle-message cluster ["put" "name" "user" "tree" "kind" "foobar"]) (server/handle-message cluster ["get" "guid" "user" "tree" "kind" "foobar"]))))
+      (is (= (handle-message-macro cluster ["put" "name" "user" "tree" "kind" "foobar"]) (handle-message-macro cluster ["get" "guid" "user" "tree" "kind" "foobar"]))))
 
     (truncate-n-test cluster "getname after putname"
-      (let [[_ _ _ _ _ guid] (server/handle-message cluster ["put" "name" "user" "tree" "kind" "foobar"])]
-        (is (= (server/handle-message cluster ["put" "name" "user" "tree" "kind" "foobar"]) (server/handle-message cluster ["get" "name" guid])))))))
+      (let [[_ _ _ _ _ guid] (handle-message-macro cluster ["put" "name" "user" "tree" "kind" "foobar"])]
+        (is (= (handle-message-macro cluster ["get" "guid" "user" "tree" "kind" "foobar"]) (handle-message-macro cluster ["get" "name" guid])))))
+))
 
 (deftest test-zmqserver-handle-label-all-message
   (let [node (str (f/uuid-1))]
-    (storage/with-connection [cluster ["127.0.0.1"] "leela"]
+  (storage/with-connection [cluster ["127.0.0.1"] {}]
+   (storage/use-attr-schema cluster "leela")
+   (storage/use-graph-schema cluster "leela")
 
       (truncate-n-test cluster "getlabel-all with no data"
-        (is (= (server/msg-label []) (server/handle-message cluster ["get" "label" "all" node]))))
+        (is (= (server/msg-label []) (handle-message-macro cluster ["get" "label" "all" node]))))
 
       (truncate-n-test cluster "getlabel-all after putlabel"
-        (server/handle-message cluster ["put"
+        (handle-message-macro cluster ["put"
                                         "label"
                                         node "0"
                                         node "1"
                                         node "2"])
-        (is (= (server/msg-label ["0" "1" "2"]) (server/handle-message cluster ["get" "label" "all" node]))))
+        (is (= (server/msg-label ["0" "1" "2"]) (handle-message-macro cluster ["get" "label" "all" node]))))
 
       (truncate-n-test cluster "getlabel-all pagination"
-        (server/handle-message cluster ["put"
+        (handle-message-macro cluster ["put"
                                         "label"
                                         node "0"
                                         node "1"
                                         node "2"])
-        (is (= (server/msg-label ["0"]) (server/handle-message cluster ["get" "label" "all" node "" "1"])))
-        (is (= (server/msg-label ["1"]) (server/handle-message cluster ["get" "label" "all" node "1" "1"])))
-        (is (= (server/msg-label ["2"]) (server/handle-message cluster ["get" "label" "all" node "2" "1"])))))))
+        (is (= (server/msg-label ["0"]) (handle-message-macro cluster ["get" "label" "all" node "" "1"])))
+        (is (= (server/msg-label ["1"]) (handle-message-macro cluster ["get" "label" "all" node "1" "1"])))
+        (is (= (server/msg-label ["2"]) (handle-message-macro cluster ["get" "label" "all" node "2" "1"])))))))
 
 (deftest test-zmqserver-handle-label-prefix-message
   (let [node (str (f/uuid-1))]
-    (storage/with-connection [cluster ["127.0.0.1"] "leela"]
+  (storage/with-connection [cluster ["127.0.0.1"] {}]
+   (storage/use-attr-schema cluster "leela")
+   (storage/use-graph-schema cluster "leela")
 
       (truncate-n-test cluster "getlabel-prefix with no data"
-        (is (= (server/msg-label []) (server/handle-message cluster ["get" "label" "pre" node "1" "2"]))))
+        (is (= (server/msg-label []) (handle-message-macro cluster ["get" "label" "pre" node "1" "2"]))))
 
       (truncate-n-test cluster "getlabel-prefix after putlabel"
-        (server/handle-message cluster ["put"
+        (handle-message-macro cluster ["put"
                                         "label"
                                         node "00"
                                         node "01"

                                        node "20"
                                        node "21"
                                        node "22"])
        (is (= (server/msg-label ["10" "11" "12"]) (server/handle-message cluster ["get" "label" "pre" node "1" "2"]))))

      (truncate-n-test cluster "getlabel-prefix pagination"
        (server/handle-message cluster ["put"
                                        "label"
                                        node "00"
                                        node "01"

                                        node "21"
                                        node "22"])
        (storage/with-limit 1
          (is (= (server/msg-label ["10"]) (handle-message-macro cluster ["get" "label" "pre" node "1" "2"])))
          (is (= (server/msg-label ["11"]) (handle-message-macro cluster ["get" "label" "pre" node "11" "2"])))
          (is (= (server/msg-label ["12"]) (handle-message-macro cluster ["get" "label" "pre" node "12" "2"]))))))))

(deftest test-zmqserver-handle-label-exact-message
  (let [node (str (f/uuid-1))]
  (storage/with-connection [cluster ["127.0.0.1"] {}]
   (storage/use-attr-schema cluster "leela")
   (storage/use-graph-schema cluster "leela")

      (truncate-n-test cluster "getlabel-exact with no data"
        (is (= (server/msg-label []) (handle-message-macro cluster ["get" "label" "ext" node "foobar"]))))

      (truncate-n-test cluster "getlabel-exact after putlabel"
        (handle-message-macro cluster ["put" "label" node "foobar"])
        (is (= (server/msg-label ["foobar"]) (handle-message-macro cluster ["get" "label" "ext" node "foobar"])))))))

(deftest test-zmqserver-handle-getlink-message
  (let [node-a (str (f/uuid-from-time 1))
