Use find iterator method and add tests