Finished delete method and tests