Ajay/Pooja | #2712 | Fixing test