more tests, and fixed neighbor