KT-4159 Refactored code and tests
KT-4159: renamed test cases
KT-4159: added simple test case