SPLEVO-340
If-Else Refactoring With Static Configuration Class

-New Import tests added
-Minor changes