refactor tests
Move AnnotationTest to another test case
Refactor tests