Neha,Indraneel | #1875 | fixed tests