Add SearchByName method
Refactor tests