Move into unit folder and finish mediator tests