Fix up EHLO and HELO tests