Adapt AnnotationDaoTest #3701