Refactor around mail to notification rename in tests