Fix up annotations in test