Refactor tests. Break up URI and NameURI.