Renamed test to service, more descriptive