Refactored annotation tests