Almost all cucumber tests fixed, almost all emails moved to the new format.