improve todo comment
Fix failing AnnotationUtilsTest