add mapper tests