Fix unit tests and made some refactoring to handle generics with most of AA annotations