Update uid and add tests