Merge "Update reference to test in TEST_MAPPING"