More shipShouldOccupyOnlyOneSquare test refactoring