Tidy up tests
First cut of neighbours counter