Unit test, refactor, and fix for issue found while looking into issue #90 where searchFor method was not working correctly.