- added pair mappings and tests