reengineering of OrgUnitMapper and coresponding test (part II)