Melanie/Ajay | #4053 | Fixing ut