Neha | bdshr-364 | fixing tests.