Prepare-for-tests refactoring
Tests for ServiceControl