Merge "Update TEST_MAPPING"