Fix indents
Fix test cases now ConfigHelper is gone