Refactored and Fixed Unit Testing process. Added Annotation types. Changes applied to the readers.