KT-4159: added test cases
KT-4159: issue fixed