Fixing email tests