updates Find and adds tests