Improve exponential tests.
Merge master into exec feature branch.