added mappers and tests