Make tests pass, improved logic to ensure there are never 0 columns