DC/Pooja | #2066 | fixing tests