Update mapper test to meet recent changes.