Fixing unit tests regarding tagging.