Pooja/Shruthi | #1987 | Fixing tests