Improve neighborhood
Add basic tests