Merge "Rename test in TEST_MAPPING" into rvc-dev