Revert uniqueness testing and validation