Apologies, it won't let me comment in the right place - but the supervisor.deferred_pool mocking (and assertions) can probably also be eliminated in this PR?