Use cljx, change cljsbuild names
Minor test refactoring