Ajay/DC | #2978 | Fixing ut