Changed some deftests to defn, they really aren't clojure tests