cleanup MessageCoordinator, add unit test