Removing email code from test scripts, master branch.