DC/Ajay | #4009 | fixing tests