Refactoring
New annotation test