Ajay| #3067 | Fixing failing ut