Ajay | #3629 | Fixing ut