Add URI.js dependency and use for url building.  Fixup test cases