Annotatable base class implemented; added annotation search methods; annotation tests udpated