Fix up the linkage to the annotator and update tests