Fixing test and *really* adding service name