Added URI parsing lib
Fix 2 test failures