Ajay | #2600 | Fixing failing ut