upgrade new_custodian and fix sample_data