refractored messageCoordinator
refactoring, update unitTests