Cleaned up batch configurations
Adding various checks to BatchBuilder and associated unit tests