changes to try to brng the server functionality back
router, server, mail_creator, mail_sender specs now all passing again