Merge "Fixed test related to tag-ext"