Added and fixed AddAnnotationField/Value tests.