Fix tests according to the new mail sending policy