Finished neighbours generator and added tests