changes made by milind for solving testing issues