Refactor. Move find logic to repository class. Remove unused classes and code.
Add init test
Fix test