Merge "Update reference to test in TEST_MAPPING" into rvc-dev