refactor annotation tests