make chunk generator private and update tests