add find method and improve tests