Merge "Update test mapping" into main