Dileep/DC | #2952 | fixing tests