fixed mapping tests