wip: fix MapperTest errors.