Config component refactored
Config component tests refactored