Exercise more of the Service machinery