Added tearDown to fix
Added support to send email on update