adding mappings and tests