More test coverage; URI fixes