Update unique fix
More tests