Adding demand restart.
Adding a restart test strategy to integers.
Cleaning up the demand restart code.