URI bug fixed, tests are green