Include storage when annotations are included
Add AnnotationProvider tests