Mapping test added

+ other minor fixes