Fix fake recipients.

Also, pull them into the tested bits so they won't break again.