Rename files & add annotation test