Fix mapping test breakage