Start fleshing out the unit tests a bit more, adjust the 'message' types