Merge "Update TEST_MAPPING for ravenwood" into main