Fixing neighbor tests