Revert changes to pickle test

Filter works on non-aggregate annotations

Aggregate over non-aggregate annotations

Annotations now have own test module

Remove implementation comments

Test annotations work with update

Rename and change refs for property aggregates to annotations

Change all references of aggregate to annotation where appropriate

More annotation tests

Tests for annotations on MTI models

arrange imports a little better

Fix merge errors