* Fix left over comments from #56717 - no need to keep UNIFI_SERVICES if we control it is only called while UNIFI_DOMAIN is empty * Fix late comments as well * Improve service tests * mock.called_with was not reliable