updating to support lein 2
splitting tests