Adds EmailContent and tests