1. Don't show helo=[<ip address>] unnecessarily. 2. Update old test