544aad390d
Move remaining tests to AnnotationGenTest (where they did belong to in the first place)
Move remaining tests to AnnotationGenTest (where they did belong to in the first place)