mediator tests cleanup