[NEXUS-7657] Cleanup uninitialized set on deregistration + update tests