Fixing unit tests regarding tagging.

Try this one.