Fix mapping tests