Pooja/AShwin | #1987 Fixing tests.