Ajay | #0000 | Fixing failing tests