Attempt to utilise the cleanup handler. Fail to.

For some reason, it's generating compilation errors on
uncommenting it; maybe check is doing something?
Commit rest of tests. [failing: round_robin_async]