Dev

This is a cleanup for testing via clojurescript.test.