~ further clean-up
~ added 'ServiceFactory_without_service_Test' test