Redo the changes in Testing