Fix tests and update Clojure