First round of new tests for #1451 #1558
Add tests for each email tag function #1451 #1558