one more test and cleaning
pedantic freak
merge several SourceConfig into Config with tests