Fixed annotation [ci skip]
Added missing tests