refactored templates a little, text + html emails sending, tests passing again