Tests and validations added for Tag and Survey