Refine the find of Insert and Add new find test