small updates to some sample message classes, fix failing test, etc