Moved tests to directory
Correct path
Lost AnnotationParser
Fixed notice errors