finish AnnotationClassLoader & some test refactoring