Merge "Make testMultipleMessagesDispatched slightly less overspecified." into tm-dev