Moved all the clojure tests out
Refactored around the pivot point - the spatula