Confirm and complete email change requests

Also add tests and new, more standard email templates