[US4394] Add intermediate work on client and service with some tests