Fix cljs tests and Address PR comments