Improving CITE urn support.  Building better environment for testing.