Pooja/ Ashwin| #2513| Fixing failing test.