Pooja/Shruthi - #1916 - Fixing tests