Renamed Mapping class
Merge branch 'refactor/mapping-class'
Add missing tests