added Generic and TypeSafety test, updated Annotation test