Started updating tests, changed nodemailer