Fixed unittests, adapted occurances of ClassAnnotationReader