Merge "Fix test-deregistration script"