Test/Fix enabled, flatten-walk method added, three log settings