Fix tests to honor now-current URI structure.