Finalized new mail template before substitution
Replaced mail endpoint with updated endpoint

Also deprecated test_mail endpoint