Refactored config service, improved tests
Refactored config service, improved tests
Just comments