changed find and updated tests