find functionality implemented
refactored tests to be even more compact