Refactoring of service names and new config option
fix phpunit