started working on email, fixing tests