Don't measure cleanup phase in benchmarks.
Rewrite tunnel tests to the new API.