This makes the tests easier to copy and relocate to other test numbers without having to update content. Closes #6738
...to the client address as this frees the RCPT strings to contain just an email address and by passing the test number into curl as the client address remains consistent with POP3 and IMAP tests as they are specified in the URL.