Add new fields to batch tests