Test generator repaired for xrange case