This seems a bit unrelated to the test refactor -- it's a fairly drastic change to what options we include with messages. Given the presence of new routing I'm +1 on the change but I'd like us to remove `make_message_options` entirely then so there aren't bits left around to trip up people who read it. It would probably be best for this change to get into develop sooner rather than later so we can try it out.