DC/Ajay | #3841 | Removing tests