Merge "Bring ServiceTestCase in line with current Service APIs and remove unnecessary asserts."