Merge "Add the related tests for Icon in TEST_MAPPING"