Merge "Add more junits to auth-batch"