better names
made tests more concise and comprehensive
clearned up logic in neighbor specs