Add and augment some annotate.py tests.