Adding tests for ResolveServices