rename uri->url: include tests!