Removed excessive annotations.
Added test for BeanToMapMapper and updated existing.