Reorganize tests for easier only Javersion or Clojure runs