Add mappings module
Add mappings module and tests
Additional mapping of values, and new test