Activation email sending
Improved test cleanup