Pooja | Fixing failing unit tests