Simplified or not, I think it is broken.  This is the one test failing, and I suspect it will break on master too.  Probably broken in a recent release, but we don't know yet.

I don't think anything in this branch is related to this test.  Just the test.  Could be promoted independently, but this is ready too.