Refactor + logging config modification
Refs #9051, #9050. Added more tests + fixed some bugs revealed by the tests.