Convert to Token Auth scheme. Improve the tests a bit to prevent looking at the recipients for a message that hasn't been build yet.