mapper: fixed getResource() & tests
mapper: refactoring - all mappers must be used under the unique name