Continuing reviewing and refactor the emails

Refactored most of the emails and the tests were already made for them. Some tests need to be improved, and some emails still need to be changed to the new format.

refs #371