* handle message-ids a bit specially, update unit tests