add find and unit tests