Added some conveniences for auto-namespacing uris to expected values