added mappings and tests for mappings