fix mapping tests