Filter works on non-aggregate annotations
Aggregate over non-aggregate annotations
Annotations now have own test module