fix mapper test problem in 2.7

#18
improve mapping and validations

#18