Fixing unit tests regarding tagging.
Merge pull request #1 from nimbinatus/master

Fixing unit tests regarding tagging.