add remaining old mapper tests