Add ServiceResolver
Add Test suffix to ServiceResolverTest