Fix the neighbours - Pass all tests