Some refactoring
test cfg was changed