Annotations implemented; annotations tests added