Merge "Adding ability to resume test after crash."