SPLEVO-340
If-Else Refactoring With Static Configuration Class

- added further tests for the refactorings that were not covered