Fix tests

Were broken by recent changes.
Configure Mandrill