[RIC-431] REDESIGN - Modify Setup Flows to call AddNbIdentity | Modify UTs