Service test, clients test; refactoring.