Added neighbor methods and test methods