Merge "Change TEST_MAPPING" into main