Refactor the Service following #2447#2500

mattmoor wants to merge 1 commit intoknative:masterknative/serving:masterfrom

mattmoor:refactor-service-testmattmoor/serving:refactor-service-testCopy head branch name to clipboard