finished adding original parsed uri

included tests