adding mock current user and improve deletion