I'm not going to block on this for this patch, because I've let it through for others, but I think that this long tuple style of assertion is not great for reading. Perhaps we could use dicts and the dict matchers for greater comprehensibility and less noise.