adding comments to annotations, and fixing test cases for annotations