Added test cases for defects MAGN-2525, 2453