Ajay/Melanie |#3555| Adding tests for deleted unique-id