Merge "Fix test_mapping entry for broadcast related tests."