Update failing testcases to reflect the Tag -> TagAnnotation change.