Fixing test related to mapper changes