Include allow_overlap in the list of equality fields for a job.
Some work on a state restore test.