added unit tests, fixed :when nil, updated Clojure to 1.6.0