Added 2 test cases for Defect MAGN-2247 and 2311