Add get_mapper
Refactor tests