Moved and renamed mapper test