Added in some support for tagging annotations in test mode