 
 ; Tests
 
-(defn- base-test
-  "Returns a map of base test settings"
+(defn- atomix-test
+  "Returns a map of atomix test settings"
   [name]
-  (let [base-test tests/noop-test]
-    (merge base-test
-           {:name     (str "atomix " name)
-            :os       debian/os
-            :db       (db "1.0")
-            :checker  (checker/compose {:linear checker/linearizable})
-            })))
+  (merge tests/noop-test
+         {:name (str "atomix " name)
+          :os   debian/os
+          :db   (db)
+          }))
 
 (defn- cas-register-test
   "Returns a map of jepsen test configuration for testing cas"
   [name opts]
-  (let [base-test (base-test (str "cas register " name))]
-    (merge base-test
-           {:client    (cas-register-client (:nodes base-test))
-            :model     (model/cas-register)
-            :checker   (checker/compose {:linear checker/linearizable
-                                         :latency (checker/latency-graph)})
-            :generator (->> gen/cas
-                            (gen/delay 1/2)
-                            std-gen)}
-           opts)))
+  (merge (atomix-test (str "cas register " name))
+         {:client    (cas-register-client)
+          :model     (model/cas-register)
+          :checker   (checker/compose {:html    timeline/html
+                                       :linear  checker/linearizable
+                                       :latency (checker/latency-graph)})
+          :generator (->> gen/cas
+                          (gen/delay 1/2)
+                          std-gen)}
+
+         opts))
 
 (def cas-bridge-test
   (cas-register-test "bridge"

(defn start!
  "Starts atomix."
  [node test]
  (let [nodes (into #{} (:nodes test))
        other-nodes (clojure.set/difference nodes (set [node]))
        local-node-arg "5555"
        other-node-args (doall (map #(str (name %) ":5555")


(defn cas-register-client
  "A basic CAS register client."
  []
  (CasRegisterClient. nil nil))

; Generators

