ServiceClientManager + UnitTest + renaming stuff