Fix clojure 1.3 failures, change require to use, replace test fixures by home grown macro