Addtional find refactoring.  Added some tests.