Ajay/Pooja | #3143 | Fixing tests