Updated the tests to correspond with the latest MessageServer.
A new test and minor edits.