added client service and tests
added tests for excluding