Add mapper tests