Integrate tagsouptest into main code