CARD #149
https://trello.com/c/sGHgu3jr

added test to finder.
some fixes to finder.find