MapAnnotation tests 

Adds the MapAnnotation to the annotation tests
Test: Check that the (annotation related) integration tests pass.

Note: This will currently fail, because MapAnnotations aren't loaded properly at moment.