aid module & tests - urn module  minor refactoring