Update uri-encode/uri-decode and tests.