SPLEVO-340
If-Else Refactoring With Static Configuration Class

-bugfix
-test updated