Improved MessageService test
Cleanup
Cleanup
Cleanup
Integration testing reveals issues.