Updating API for annotated tags.  Add tests for API.