Add annotation tests