Update to new layout.
Update and fix various bugs.
Ensure we don't undo unless we are benchmarking.
Allow skipping any non-benched test.