Fixed test mapping