Modified Delete Button , Improved Tests