Merge "Add junits to batch & cass modules"