Merge "Don't require a list of services in tests"