SPLEVO-340
If-Else Refactoring With Static Configuration Class

-handling for variable conditions changed
-condition tests updated