Implement more of find for hydrate test