Test should be done now

There is a method on `UniqueId` to do this that we should use instead.