Add tests for mapping and update docs and roadmap