added find function and tests