This makes the tests easier to copy and relocate to other test numbers without having to update content. Closes #6738
Added SMTP (RFC-821 only) based test case as a reference for the fix provided by commit fe260b75e7.
fe260b75e7