Cleanup of the URI extension.
Add URI class tests.