- implementing test for DefaultTypeMapperImpl
- adding additional NPE guards