Resolved fatal errors in model and mapper tests.
Added DataMap class.
Resolved broken tests.
Added more tests for abstract mapper.
Merge branch 'feature/data-map' into develop