Refactored cell spec and added spec to ensure neighbours are not added twice