Merge pull request #27 from mknoszlig/master

Problem: clojure tests don't run reliably
update clojure code from template, adapt tests.