Fixed test. Issue: #370
Add error handling to delete message service. Add testing. Issue: #370
Break up send-message service a bit. More testing. Issue: #370