migrating to uri wrapper
fixing tests