WIP - added mediator tests
WIP - add tests