Reverted default for service name, added/updated tests