add find function and unit tests