Added test cases for [DDC-2042]