Benchmarks: Improved failure case handling

Removes most NOCOMMIT’s by improving failure detection and handling.
Adds tests for failures during state transitions.