cleanup in test_service

Change-Id: I122fabaf333486ce66caa4496061ee38d4456296
fix docstrings

Change-Id: If05e4e615972a5a8d9d282ff33d7c09bfde69a82