Tests passing on send-emails branch