ENG-4096: remove unique check and change cooresponding test cases