Fix CC and BCC handling

will no longer stuff all recipients into the TO header.  CC and BCC will work properly now, updated test to validate all recipient headers
FYI, the updated test still passes for me locally without the above change so I think there's still something extra to test here to make sure this doesn't regress.