Rename underscore vendor
Update findNeighborhood, extend tests