Merge "Update TEST_MAPPING for bug reporting" into main