added Mediator and some failing tests