Re-add delivery step
Attempt to silence deprecation
No more testmail
Merge branch 'delivery_required' into no_order_mailer