Debugging a problem, I wrote a bunch of tests to help me understand
what was happening. The fix is being pursued in a revert, but I want
us to merge the tests as well so we don't get regressions.