<Riya/Apurva> Tests bug solved