Few methods are refactored in ClientGridNCD.
More tests for client mediator.