Bit refactored config files - using default section, having .yml.default template
Fixed tests